aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorisiora <none@example.com>2017-11-15 14:10:36 +0000
committerisiora <none@example.com>2017-11-15 14:10:36 +0000
commit156924d2a00ba46f45e440619583b5c48471361b (patch)
tree72ed8fd424105d490fd58dba3cbab9ad3f093736
parent39242538b7ee9248a3cab2e948bcf3a99c90baa3 (diff)
downloadChibiOS-156924d2a00ba46f45e440619583b5c48471361b.tar.gz
ChibiOS-156924d2a00ba46f45e440619583b5c48471361b.tar.bz2
ChibiOS-156924d2a00ba46f45e440619583b5c48471361b.zip
Updated Makefiles
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11012 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rwxr-xr-xtesthal/ATSAMA5D2/MATRIX/Makefile10
-rw-r--r--testhal/ATSAMA5D2/SPI/Makefile6
-rwxr-xr-xtesthal/ATSAMA5D2/TC/Makefile6
-rw-r--r--testhal/ATSAMA5D2/UART/Makefile6
4 files changed, 14 insertions, 14 deletions
diff --git a/testhal/ATSAMA5D2/MATRIX/Makefile b/testhal/ATSAMA5D2/MATRIX/Makefile
index 432a1b5c4..3f185becd 100755
--- a/testhal/ATSAMA5D2/MATRIX/Makefile
+++ b/testhal/ATSAMA5D2/MATRIX/Makefile
@@ -112,7 +112,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
# Startup files.
-include $(CHIBIOS)/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
+include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/SAMA/SAMA5D2x/platform.mk
@@ -123,11 +123,11 @@ include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/SAMA5D2-T.ld
+LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -240,7 +240,7 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARM/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC
include $(RULESPATH)/rules.mk
##############################################################################
diff --git a/testhal/ATSAMA5D2/SPI/Makefile b/testhal/ATSAMA5D2/SPI/Makefile
index 9566b4367..52802f056 100644
--- a/testhal/ATSAMA5D2/SPI/Makefile
+++ b/testhal/ATSAMA5D2/SPI/Makefile
@@ -112,7 +112,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
# Startup files.
-include $(CHIBIOS)/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
+include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/SAMA/SAMA5D2x/platform.mk
@@ -127,7 +127,7 @@ include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/SAMA5D2-T.ld
+LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -241,7 +241,7 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARM/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC
include $(RULESPATH)/rules.mk
##############################################################################
diff --git a/testhal/ATSAMA5D2/TC/Makefile b/testhal/ATSAMA5D2/TC/Makefile
index a747e9b67..de5b87f5e 100755
--- a/testhal/ATSAMA5D2/TC/Makefile
+++ b/testhal/ATSAMA5D2/TC/Makefile
@@ -112,7 +112,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
# Startup files.
-include $(CHIBIOS)/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
+include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/SAMA/SAMA5D2x/platform.mk
@@ -125,7 +125,7 @@ include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
#include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/SAMA5D2-T.ld
+LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -238,7 +238,7 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARM/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC
include $(RULESPATH)/rules.mk
##############################################################################
diff --git a/testhal/ATSAMA5D2/UART/Makefile b/testhal/ATSAMA5D2/UART/Makefile
index 7997f0dc5..6610a8bea 100644
--- a/testhal/ATSAMA5D2/UART/Makefile
+++ b/testhal/ATSAMA5D2/UART/Makefile
@@ -112,7 +112,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../..
# Startup files.
-include $(CHIBIOS)/os/common/startup/ARM/compilers/GCC/mk/startup_sama5d2.mk
+include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/SAMA/SAMA5D2x/platform.mk
@@ -127,7 +127,7 @@ include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk
#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/SAMA5D2-T.ld
+LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -240,7 +240,7 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARM/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC
include $(RULESPATH)/rules.mk
##############################################################################