diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:48:09 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:48:09 -0700 |
| commit | 72b22c7f67df0bddc2094ecfd76f82f0bfb06172 (patch) | |
| tree | 0e05f57f7d53736ad6a00fabaabd33349bcce960 /os | |
| parent | cd7559268dcc2da5f2b1f3872e6baa1cff1d5476 (diff) | |
| parent | 1fefdf78fef847c27d3768cc78de0ee901889465 (diff) | |
| download | ChibiOS-Contrib-72b22c7f67df0bddc2094ecfd76f82f0bfb06172.tar.gz ChibiOS-Contrib-72b22c7f67df0bddc2094ecfd76f82f0bfb06172.tar.bz2 ChibiOS-Contrib-72b22c7f67df0bddc2094ecfd76f82f0bfb06172.zip | |
Merge branch 'master' into mike
Diffstat (limited to 'os')
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf52.mk | 3 | ||||
| -rw-r--r-- | os/hal/ports/KINETIS/LLD/hal_pal_lld.h | 5 |
2 files changed, 2 insertions, 6 deletions
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 @@ -83,11 +83,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
* belonging to a port.
|