From 1fefdf78fef847c27d3768cc78de0ee901889465 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Wed, 2 May 2018 03:47:26 -0700 Subject: Remove duplicate code already in upstream master and add include dir --- os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk | 3 ++- os/hal/ports/KINETIS/LLD/hal_pal_lld.h | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'os') diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk index 693ae67..450ec41 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk @@ -5,6 +5,7 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF52832 \ - $(CHIBIOS)/os/common/ext/CMSIS/include + $(CHIBIOS)/os/common/ext/CMSIS/include \ + $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld diff --git a/os/hal/ports/KINETIS/LLD/hal_pal_lld.h b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h index 6129f69..833d95e 100644 --- a/os/hal/ports/KINETIS/LLD/hal_pal_lld.h +++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h @@ -82,11 +82,6 @@ typedef uint32_t ioline_t; */ typedef GPIO_TypeDef *ioportid_t; -/** - * @brief Type of an pad identifier. - */ -typedef uint32_t iopadid_t; - /** * @brief Port Configuration. * @details This structure stores the configuration parameters of all pads -- cgit v1.2.3