From 74065b233afc62203edcb68f281da5839dad5930 Mon Sep 17 00:00:00 2001 From: barthess Date: Mon, 24 Aug 2015 16:26:22 +0300 Subject: Fixed rest of paths in build scripts. --- demos/NRF51/RT-WVSHARE_BLE400/Makefile | 3 +- demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | 3 +- demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile | 3 +- demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject | 43 +++++++++++----------- demos/TIVA/RT-TM4C123G-LAUNCHPAD/.project | 1 + demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile | 3 +- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile | 3 +- demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile | 3 +- demos/various/RT-Win32-TriBuf/Makefile | 3 +- .../ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk | 4 +- .../ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk | 4 +- .../ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk | 4 +- .../boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk | 4 +- os/hal/ports/TIVA/TM4C123x/platform.mk | 4 +- os/hal/ports/TIVA/TM4C129x/platform.mk | 2 +- testhal/NRF51/NRF51822/EXT/Makefile | 1 - testhal/NRF51/NRF51822/SPI/Makefile | 1 - testhal/STM32/STM32F0xx/crc/halconf_community.h | 14 +++---- testhal/STM32/STM32F1xx/onewire/Makefile | 1 - testhal/STM32/STM32F1xx/onewire/chconf.h | 4 +- .../STM32/STM32F1xx/onewire/halconf_community.h | 7 ++++ .../STM32/STM32F4xx/onewire/halconf_community.h | 8 ++++ testhal/TIVA/TM4C123x/EXT/Makefile | 1 - testhal/TIVA/TM4C123x/GPT/Makefile | 1 - testhal/TIVA/TM4C123x/I2C/Makefile | 1 - testhal/TIVA/TM4C123x/PWM/Makefile | 1 - testhal/TIVA/TM4C123x/SPI/Makefile | 1 - 27 files changed, 72 insertions(+), 56 deletions(-) diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile index d9efbf7..ffa30f4 100644 --- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile +++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile @@ -80,7 +80,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk # HAL-OSAL files (optional). diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile index db8f2c7..15bee21 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile @@ -86,7 +86,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk # HAL-OSAL files (optional). diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile index 961e4ee..1cbe3c2 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile @@ -86,7 +86,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk # HAL-OSAL files (optional). diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject index c3595ba..109f8d7 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject @@ -1,34 +1,33 @@ - - + - - + + - + + + - - - - - - - - - - + + + + + + + + - - + + - - + + @@ -38,14 +37,16 @@ - + + + + - diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.project b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.project index 20ea47b..a6f7408 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.project +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.project @@ -74,6 +74,7 @@ org.eclipse.cdt.core.cnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.eclipse.cdt.core.ccnature diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile index c43e2aa..47560db 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile @@ -80,7 +80,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk # HAL-OSAL files (optional). diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile index 7f833f8..f69722b 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile @@ -80,7 +80,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk # HAL-OSAL files (optional). diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile index d7b834c..08aace6 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile @@ -80,7 +80,8 @@ endif PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk # HAL-OSAL files (optional). diff --git a/demos/various/RT-Win32-TriBuf/Makefile b/demos/various/RT-Win32-TriBuf/Makefile index 40e5179..0ed677e 100644 --- a/demos/various/RT-Win32-TriBuf/Makefile +++ b/demos/various/RT-Win32-TriBuf/Makefile @@ -56,7 +56,8 @@ UDEFS = UADEFS = # Imported source files -CHIBIOS = ../../../.. +CHIBIOS = ../../../../ChibiOS-RT +CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib include $(CHIBIOS)/os/hal/boards/simulator/board.mk include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/simulator/win32/platform.mk diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk index 7433ba2..2824ae7 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk +++ b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk @@ -4,8 +4,8 @@ STARTUPSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt1.c \ STARTUPASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s -STARTUPINC = $(CHIBIOS)/community/os/common/ports/ARMCMx/devices/NRF51822 \ +STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/devices/NRF51822 \ $(CHIBIOS)/os/ext/CMSIS/include -STARTUPLD = $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/ld +STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/ld diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk index 35d4fc8..409c015 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk +++ b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk @@ -4,7 +4,7 @@ STARTUPSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt1.c \ STARTUPASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s -STARTUPINC = $(CHIBIOS)/community/os/common/ports/ARMCMx/devices/TM4C123x \ +STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/devices/TM4C123x \ $(CHIBIOS)/os/ext/CMSIS/include -STARTUPLD = $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/ld +STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/ld diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk index 6ce72da..f24e046 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk +++ b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk @@ -4,7 +4,7 @@ STARTUPSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt1.c \ STARTUPASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s -STARTUPINC = $(CHIBIOS)/community/os/common/ports/ARMCMx/devices/TM4C129x \ +STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/devices/TM4C129x \ $(CHIBIOS)/os/ext/CMSIS/include -STARTUPLD = $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/ld +STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/ld diff --git a/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk b/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk index e970729..8c28257 100644 --- a/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk +++ b/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.c +BOARDSRC = $(CHIBIOS_CONTRIB)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.c # Required include directories -BOARDINC = $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2 +BOARDINC = $(CHIBIOS_CONTRIB)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2 diff --git a/os/hal/ports/TIVA/TM4C123x/platform.mk b/os/hal/ports/TIVA/TM4C123x/platform.mk index e4e45ef..0e69f15 100644 --- a/os/hal/ports/TIVA/TM4C123x/platform.mk +++ b/os/hal/ports/TIVA/TM4C123x/platform.mk @@ -8,8 +8,8 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/gpt_lld.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pwm_lld.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/spi_lld.c \ - ${CHISIOS}/community/os/hal/ports/TIVA/LLD/tiva_udma.c \ - ${CHISIOS}/community/os/hal/ports/TIVA/LLD/ext_lld.c + ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/tiva_udma.c \ + ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c # Required include directories PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \ diff --git a/os/hal/ports/TIVA/TM4C129x/platform.mk b/os/hal/ports/TIVA/TM4C129x/platform.mk index 6131ff0..a3577d1 100644 --- a/os/hal/ports/TIVA/TM4C129x/platform.mk +++ b/os/hal/ports/TIVA/TM4C129x/platform.mk @@ -5,7 +5,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \ ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/mac_lld.c \ - ${CHISIOS}/community/os/hal/ports/TIVA/LLD/ext_lld.c + ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c # Required include directories PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \ diff --git a/testhal/NRF51/NRF51822/EXT/Makefile b/testhal/NRF51/NRF51822/EXT/Makefile index 6dae021..9770772 100644 --- a/testhal/NRF51/NRF51822/EXT/Makefile +++ b/testhal/NRF51/NRF51822/EXT/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk diff --git a/testhal/NRF51/NRF51822/SPI/Makefile b/testhal/NRF51/NRF51822/SPI/Makefile index 6a1784f..e918159 100644 --- a/testhal/NRF51/NRF51822/SPI/Makefile +++ b/testhal/NRF51/NRF51822/SPI/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_nrf51.mk diff --git a/testhal/STM32/STM32F0xx/crc/halconf_community.h b/testhal/STM32/STM32F0xx/crc/halconf_community.h index 9f2aa99..a46f7eb 100644 --- a/testhal/STM32/STM32F0xx/crc/halconf_community.h +++ b/testhal/STM32/STM32F0xx/crc/halconf_community.h @@ -45,6 +45,13 @@ #define HAL_USE_EICU FALSE #endif +/** + * @brief Enables the community subsystem. + */ +#if !defined(HAL_USE_CRC) || defined(__DOXYGEN__) +#define HAL_USE_CRC TRUE +#endif + /*===========================================================================*/ /* FSMCNAND driver related settings. */ /*===========================================================================*/ @@ -76,13 +83,6 @@ /* CRC driver settings. */ /*===========================================================================*/ -/** - * @brief Enables the community subsystem. - */ -#if !defined(HAL_USE_CRC) || defined(__DOXYGEN__) -#define HAL_USE_CRC TRUE -#endif - /** * @brief Enables DMA engine when performing CRC transactions. * @note Enabling this option also enables asynchronous API. diff --git a/testhal/STM32/STM32F1xx/onewire/Makefile b/testhal/STM32/STM32F1xx/onewire/Makefile index 31a3162..1484a28 100644 --- a/testhal/STM32/STM32F1xx/onewire/Makefile +++ b/testhal/STM32/STM32F1xx/onewire/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk diff --git a/testhal/STM32/STM32F1xx/onewire/chconf.h b/testhal/STM32/STM32F1xx/onewire/chconf.h index 5ff6e07..e714890 100644 --- a/testhal/STM32/STM32F1xx/onewire/chconf.h +++ b/testhal/STM32/STM32F1xx/onewire/chconf.h @@ -46,7 +46,7 @@ * @details Frequency of the system timer that drives the system ticks. This * setting also defines the system tick time unit. */ -#define CH_CFG_ST_FREQUENCY 10000 +#define CH_CFG_ST_FREQUENCY 1000 /** * @brief Time delta constant for the tick-less mode. @@ -56,7 +56,7 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define CH_CFG_ST_TIMEDELTA 2 +#define CH_CFG_ST_TIMEDELTA 0 /** @} */ diff --git a/testhal/STM32/STM32F1xx/onewire/halconf_community.h b/testhal/STM32/STM32F1xx/onewire/halconf_community.h index e90257b..6c628c0 100644 --- a/testhal/STM32/STM32F1xx/onewire/halconf_community.h +++ b/testhal/STM32/STM32F1xx/onewire/halconf_community.h @@ -45,6 +45,13 @@ #define HAL_USE_EICU FALSE #endif +/** + * @brief Enables the community subsystem. + */ +#if !defined(HAL_USE_CRC) || defined(__DOXYGEN__) +#define HAL_USE_CRC FALSE +#endif + /*===========================================================================*/ /* FSMCNAND driver related settings. */ /*===========================================================================*/ diff --git a/testhal/STM32/STM32F4xx/onewire/halconf_community.h b/testhal/STM32/STM32F4xx/onewire/halconf_community.h index e90257b..f106d57 100644 --- a/testhal/STM32/STM32F4xx/onewire/halconf_community.h +++ b/testhal/STM32/STM32F4xx/onewire/halconf_community.h @@ -45,6 +45,14 @@ #define HAL_USE_EICU FALSE #endif +/** + * @brief Enables the community subsystem. + */ +#if !defined(HAL_USE_CRC) || defined(__DOXYGEN__) +#define HAL_USE_CRC FALSE +#endif + + /*===========================================================================*/ /* FSMCNAND driver related settings. */ /*===========================================================================*/ diff --git a/testhal/TIVA/TM4C123x/EXT/Makefile b/testhal/TIVA/TM4C123x/EXT/Makefile index 54c0c2a..bfcb376 100644 --- a/testhal/TIVA/TM4C123x/EXT/Makefile +++ b/testhal/TIVA/TM4C123x/EXT/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk diff --git a/testhal/TIVA/TM4C123x/GPT/Makefile b/testhal/TIVA/TM4C123x/GPT/Makefile index 54c0c2a..bfcb376 100644 --- a/testhal/TIVA/TM4C123x/GPT/Makefile +++ b/testhal/TIVA/TM4C123x/GPT/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk diff --git a/testhal/TIVA/TM4C123x/I2C/Makefile b/testhal/TIVA/TM4C123x/I2C/Makefile index 3d75cc2..f50e3b9 100644 --- a/testhal/TIVA/TM4C123x/I2C/Makefile +++ b/testhal/TIVA/TM4C123x/I2C/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk diff --git a/testhal/TIVA/TM4C123x/PWM/Makefile b/testhal/TIVA/TM4C123x/PWM/Makefile index 54c0c2a..bfcb376 100644 --- a/testhal/TIVA/TM4C123x/PWM/Makefile +++ b/testhal/TIVA/TM4C123x/PWM/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk diff --git a/testhal/TIVA/TM4C123x/SPI/Makefile b/testhal/TIVA/TM4C123x/SPI/Makefile index 54c0c2a..bfcb376 100644 --- a/testhal/TIVA/TM4C123x/SPI/Makefile +++ b/testhal/TIVA/TM4C123x/SPI/Makefile @@ -81,7 +81,6 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT -CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib/ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Startup files. include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk -- cgit v1.2.3