diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
| commit | 5323be76402e0359570e81cdabd3cf929b8d41b2 (patch) | |
| tree | 1c17a57e5f4ec142f0a3cc609ce5f60999d623d1 /demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile | |
| parent | 99c3815a527585127b850f555078de4792ca7caf (diff) | |
| parent | b86af2c09feea9b50cb241c147a3881e55763a55 (diff) | |
| download | ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.gz ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.bz2 ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.zip | |
Merge branch 'master' into fix-nrf51-port
Diffstat (limited to 'demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile')
| -rw-r--r-- | demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile index 08aace6..344d3e8 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile @@ -83,7 +83,7 @@ PROJECT = ch CHIBIOS = ../../../../ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. -include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk +include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk @@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk -include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk +include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). include $(CHIBIOS)/test/rt/test.mk @@ -151,7 +151,6 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ MCU = cortex-m4 -#TRGT = arm-elf- TRGT = arm-none-eabi- CC = $(TRGT)gcc CPPC = $(TRGT)g++ @@ -207,5 +206,5 @@ ULIBS = # End of user defines ############################################################################## -RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC +RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC include $(RULESPATH)/rules.mk |