Merge pull request #157 from walkerstop/master
Kinetis compilation errors with latest code from ChibiOS master branch
This commit is contained in:
commit
43fb76203d
|
@ -7,6 +7,7 @@ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
|
||||||
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
|
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
|
||||||
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/K20x \
|
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/K20x \
|
||||||
$(CHIBIOS)/os/common/ext/CMSIS/include \
|
$(CHIBIOS)/os/common/ext/CMSIS/include \
|
||||||
|
$(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
|
||||||
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
|
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
|
||||||
|
|
||||||
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
||||||
|
|
|
@ -7,6 +7,7 @@ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
|
||||||
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
|
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
|
||||||
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/KL2x \
|
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/KL2x \
|
||||||
$(CHIBIOS)/os/common/ext/CMSIS/include \
|
$(CHIBIOS)/os/common/ext/CMSIS/include \
|
||||||
|
$(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
|
||||||
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
|
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
|
||||||
|
|
||||||
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
||||||
|
|
|
@ -5,6 +5,7 @@ STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
|
||||||
STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
|
STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
|
||||||
|
|
||||||
STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF51822 \
|
STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF51822 \
|
||||||
$(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
|
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
||||||
|
|
|
@ -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
|
STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
|
||||||
|
|
||||||
STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NRF52832 \
|
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
|
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
|
||||||
|
|
Loading…
Reference in New Issue