From ae18581dd903c5b0bf1d07e7465cbebfb14597f8 Mon Sep 17 00:00:00 2001 From: edolomb Date: Fri, 16 Mar 2018 15:04:54 +0000 Subject: - Updated demos - Minor changes git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11779 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- testhal/ATSAMA5D2/FLEX-SPI/Makefile | 25 ++--- .../FLEX-SPI/debug/SAMA5D2-FLEX-SPI (DDRAM).launch | 2 +- testhal/ATSAMA5D2/FLEX-SPI/readme.txt | 2 +- testhal/ATSAMA5D2/MATRIX/Makefile | 25 ++--- testhal/ATSAMA5D2/MATRIX/readme.txt | 2 +- testhal/ATSAMA5D2/SDMMC/Makefile | 44 ++++---- testhal/ATSAMA5D2/SDMMC/readme.txt | 2 +- testhal/ATSAMA5D2/SECUMOD/Makefile | 25 ++--- .../SECUMOD/debug/SAMA5D2-SECUMOD (DDRAM).launch | 116 ++++++++++----------- testhal/ATSAMA5D2/SECUMOD/readme.txt | 2 +- testhal/ATSAMA5D2/SERIAL/Makefile | 26 ++--- .../SERIAL/debug/SAMA5D2-SERIAL (DDRAM).launch | 2 +- testhal/ATSAMA5D2/SERIAL/readme.txt | 2 +- testhal/ATSAMA5D2/SPI/Makefile | 27 ++--- .../ATSAMA5D2/SPI/debug/SAMA5D2-SPI (DDRAM).launch | 2 +- testhal/ATSAMA5D2/SPI/main.c | 7 +- testhal/ATSAMA5D2/SPI/readme.txt | 2 +- testhal/ATSAMA5D2/TC/.cproject | 32 +++--- testhal/ATSAMA5D2/TC/Makefile | 25 ++--- .../ATSAMA5D2/TC/debug/SAMA5D2-TC (DDRAM).launch | 116 ++++++++++----------- testhal/ATSAMA5D2/TC/readme.txt | 2 +- testhal/ATSAMA5D2/UART/Makefile | 25 ++--- testhal/ATSAMA5D2/UART/readme.txt | 2 +- 23 files changed, 239 insertions(+), 276 deletions(-) diff --git a/testhal/ATSAMA5D2/FLEX-SPI/Makefile b/testhal/ATSAMA5D2/FLEX-SPI/Makefile index d80992791..f95aec96a 100644 --- a/testhal/ATSAMA5D2/FLEX-SPI/Makefile +++ b/testhal/ATSAMA5D2/FLEX-SPI/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -133,19 +138,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -168,13 +166,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/FLEX-SPI/debug/SAMA5D2-FLEX-SPI (DDRAM).launch b/testhal/ATSAMA5D2/FLEX-SPI/debug/SAMA5D2-FLEX-SPI (DDRAM).launch index d937e70b0..904e11d17 100644 --- a/testhal/ATSAMA5D2/FLEX-SPI/debug/SAMA5D2-FLEX-SPI (DDRAM).launch +++ b/testhal/ATSAMA5D2/FLEX-SPI/debug/SAMA5D2-FLEX-SPI (DDRAM).launch @@ -11,7 +11,7 @@ - + diff --git a/testhal/ATSAMA5D2/FLEX-SPI/readme.txt b/testhal/ATSAMA5D2/FLEX-SPI/readme.txt index cc6e568f6..303da320d 100644 --- a/testhal/ATSAMA5D2/FLEX-SPI/readme.txt +++ b/testhal/ATSAMA5D2/FLEX-SPI/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** diff --git a/testhal/ATSAMA5D2/MATRIX/Makefile b/testhal/ATSAMA5D2/MATRIX/Makefile index 797a1585c..0372c07ed 100755 --- a/testhal/ATSAMA5D2/MATRIX/Makefile +++ b/testhal/ATSAMA5D2/MATRIX/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -132,19 +137,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -167,13 +165,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/MATRIX/readme.txt b/testhal/ATSAMA5D2/MATRIX/readme.txt index 54fbf102d..4cad2f6fb 100755 --- a/testhal/ATSAMA5D2/MATRIX/readme.txt +++ b/testhal/ATSAMA5D2/MATRIX/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** Demo configures security zone on SRAM0. Zones are tested with two writing diff --git a/testhal/ATSAMA5D2/SDMMC/Makefile b/testhal/ATSAMA5D2/SDMMC/Makefile index c9dc8bec4..8bf1beb75 100644 --- a/testhal/ATSAMA5D2/SDMMC/Makefile +++ b/testhal/ATSAMA5D2/SDMMC/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -121,31 +126,30 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional). 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)/os/various/reledge_bindings/reledge.mk include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk include $(CHIBIOS)/os/hal/lib/streams/streams.mk + # Define linker script file here #LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld + # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) $(STREAMSSRC) \ - main.c fat32test.c reledgetest.c redconf.c $(RELEDGESRC) - -CSRC += $(CHIBIOS)/os/various/syscalls.c -CSRC += $(CHIBIOS)/os/various/fatfs_bindings/fatfs_syscall.c -CSRC += $(CHIBIOS)/ext/fatfs/src/ff.c -CSRC += $(CHIBIOS)/ext/fatfs/src/ffunicode.c +CSRC = $(ALLCSRC) main.c fat32test.c reledgetest.c redconf.c + +#CSRC += $(CHIBIOS)/os/various/syscalls.c +#CSRC += $(CHIBIOS)/os/various/fatfs_bindings/fatfs_syscall.c +#CSRC += $(CHIBIOS)/ext/fatfs/src/ff.c +#CSRC += $(CHIBIOS)/ext/fatfs/src/ffunicode.c + # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -168,13 +172,11 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various $(STREAMSINC) $(FATFSINC) $(RELEDGEINC) +INCDIR = $(ALLINC) \ + $(FATFSINC) $(RELEDGEINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/SDMMC/readme.txt b/testhal/ATSAMA5D2/SDMMC/readme.txt index 49423b98c..620f0791b 100644 --- a/testhal/ATSAMA5D2/SDMMC/readme.txt +++ b/testhal/ATSAMA5D2/SDMMC/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** Testing FF and Reliance Edge Libraries diff --git a/testhal/ATSAMA5D2/SECUMOD/Makefile b/testhal/ATSAMA5D2/SECUMOD/Makefile index 1d7a2c391..8cc6738d3 100755 --- a/testhal/ATSAMA5D2/SECUMOD/Makefile +++ b/testhal/ATSAMA5D2/SECUMOD/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -133,19 +138,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -168,13 +166,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/SECUMOD/debug/SAMA5D2-SECUMOD (DDRAM).launch b/testhal/ATSAMA5D2/SECUMOD/debug/SAMA5D2-SECUMOD (DDRAM).launch index 2f55d2f35..4d27a0177 100644 --- a/testhal/ATSAMA5D2/SECUMOD/debug/SAMA5D2-SECUMOD (DDRAM).launch +++ b/testhal/ATSAMA5D2/SECUMOD/debug/SAMA5D2-SECUMOD (DDRAM).launch @@ -1,58 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testhal/ATSAMA5D2/SECUMOD/readme.txt b/testhal/ATSAMA5D2/SECUMOD/readme.txt index bf2c08be0..d21f94f1d 100755 --- a/testhal/ATSAMA5D2/SECUMOD/readme.txt +++ b/testhal/ATSAMA5D2/SECUMOD/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** Demo configures Secumod according to SECConfig secumod_cfg. diff --git a/testhal/ATSAMA5D2/SERIAL/Makefile b/testhal/ATSAMA5D2/SERIAL/Makefile index 41ebc4ffd..33119d9e3 100755 --- a/testhal/ATSAMA5D2/SERIAL/Makefile +++ b/testhal/ATSAMA5D2/SERIAL/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -134,20 +139,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ - $(STREAMSSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -170,13 +167,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(STREAMSINC) $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/SERIAL/debug/SAMA5D2-SERIAL (DDRAM).launch b/testhal/ATSAMA5D2/SERIAL/debug/SAMA5D2-SERIAL (DDRAM).launch index 65424113b..f08264a25 100644 --- a/testhal/ATSAMA5D2/SERIAL/debug/SAMA5D2-SERIAL (DDRAM).launch +++ b/testhal/ATSAMA5D2/SERIAL/debug/SAMA5D2-SERIAL (DDRAM).launch @@ -11,7 +11,7 @@ - + diff --git a/testhal/ATSAMA5D2/SERIAL/readme.txt b/testhal/ATSAMA5D2/SERIAL/readme.txt index 2653debc7..eebbf5de9 100755 --- a/testhal/ATSAMA5D2/SERIAL/readme.txt +++ b/testhal/ATSAMA5D2/SERIAL/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** diff --git a/testhal/ATSAMA5D2/SPI/Makefile b/testhal/ATSAMA5D2/SPI/Makefile index 0e477d2d4..8006d3611 100644 --- a/testhal/ATSAMA5D2/SPI/Makefile +++ b/testhal/ATSAMA5D2/SPI/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -125,6 +130,7 @@ include $(CHIBIOS)/os/common/ports/ARMCAx-TZ/compilers/GCC/mk/port_generic.mk #include $(CHIBIOS)/test/lib/test.mk #include $(CHIBIOS)/test/rt/rt_test.mk #include $(CHIBIOS)/test/oslib/oslib_test.mk +include $(CHIBIOS)/os/hal/lib/streams/streams.mk # Define linker script file here #LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld @@ -133,20 +139,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ - $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -169,13 +167,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/SPI/debug/SAMA5D2-SPI (DDRAM).launch b/testhal/ATSAMA5D2/SPI/debug/SAMA5D2-SPI (DDRAM).launch index eb4d5e361..e0b0632a4 100644 --- a/testhal/ATSAMA5D2/SPI/debug/SAMA5D2-SPI (DDRAM).launch +++ b/testhal/ATSAMA5D2/SPI/debug/SAMA5D2-SPI (DDRAM).launch @@ -11,7 +11,7 @@ - + diff --git a/testhal/ATSAMA5D2/SPI/main.c b/testhal/ATSAMA5D2/SPI/main.c index 33e590bc4..312ca8819 100644 --- a/testhal/ATSAMA5D2/SPI/main.c +++ b/testhal/ATSAMA5D2/SPI/main.c @@ -92,14 +92,11 @@ int main(void) { chSysInit(); /* - * Activates the serial driver 0 using the driver default configuration. + * Activates the serial driver 1 using the driver default configuration. */ sdStart(&SD1, &sdcfg); spiStart(&SPID1, &mst_spicfg); /* Setup transfer parameters. */ - /* Redirecting UART1 RX on PD2 and UART1 TX on PD3. */ - palSetGroupMode(PIOD, PAL_PORT_BIT(2) | PAL_PORT_BIT(3), 0U, - PAL_SAMA_FUNC_PERIPH_A | PAL_MODE_SECURE); /* Redirecting SPI1 pins. */ palSetGroupMode(PIOD, PAL_PORT_BIT(25) | PAL_PORT_BIT(26) | @@ -111,7 +108,7 @@ int main(void) { while (true) { if(!palReadPad(PIOB, PIOB_USER_PB)) { /* SPI operation in loopback*/ - spiStartExchange(&SPID1, BUFFER_SIZE, &txbuf, &rxbuf); + spiExchange(&SPID1, BUFFER_SIZE, &txbuf, &rxbuf); /* D-Cache L1 is enabled */ cacheInvalidateRegion(&rxbuf, sizeof(rxbuf)); diff --git a/testhal/ATSAMA5D2/SPI/readme.txt b/testhal/ATSAMA5D2/SPI/readme.txt index cc6e568f6..303da320d 100644 --- a/testhal/ATSAMA5D2/SPI/readme.txt +++ b/testhal/ATSAMA5D2/SPI/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** diff --git a/testhal/ATSAMA5D2/TC/.cproject b/testhal/ATSAMA5D2/TC/.cproject index 46bec6e2d..4cd344708 100755 --- a/testhal/ATSAMA5D2/TC/.cproject +++ b/testhal/ATSAMA5D2/TC/.cproject @@ -1,8 +1,8 @@ - - + + @@ -14,20 +14,20 @@ - - - - - - - - + + + + + + + + - - + + - - + + @@ -37,11 +37,11 @@ - + - + diff --git a/testhal/ATSAMA5D2/TC/Makefile b/testhal/ATSAMA5D2/TC/Makefile index d80992791..f95aec96a 100755 --- a/testhal/ATSAMA5D2/TC/Makefile +++ b/testhal/ATSAMA5D2/TC/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -133,19 +138,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -168,13 +166,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/TC/debug/SAMA5D2-TC (DDRAM).launch b/testhal/ATSAMA5D2/TC/debug/SAMA5D2-TC (DDRAM).launch index 35fb8a470..f8af891e2 100644 --- a/testhal/ATSAMA5D2/TC/debug/SAMA5D2-TC (DDRAM).launch +++ b/testhal/ATSAMA5D2/TC/debug/SAMA5D2-TC (DDRAM).launch @@ -1,58 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testhal/ATSAMA5D2/TC/readme.txt b/testhal/ATSAMA5D2/TC/readme.txt index a07eb70c8..c123c380e 100755 --- a/testhal/ATSAMA5D2/TC/readme.txt +++ b/testhal/ATSAMA5D2/TC/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** diff --git a/testhal/ATSAMA5D2/UART/Makefile b/testhal/ATSAMA5D2/UART/Makefile index c92c547f1..9a1775df4 100644 --- a/testhal/ATSAMA5D2/UART/Makefile +++ b/testhal/ATSAMA5D2/UART/Makefile @@ -108,9 +108,14 @@ endif # Define project name here PROJECT = ch +BUILDDIR := ./build +DEPDIR := ./.dep # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk # HAL-OSAL files (optional). @@ -132,19 +137,12 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -167,13 +165,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths diff --git a/testhal/ATSAMA5D2/UART/readme.txt b/testhal/ATSAMA5D2/UART/readme.txt index 65cd69a56..84c9f5d07 100644 --- a/testhal/ATSAMA5D2/UART/readme.txt +++ b/testhal/ATSAMA5D2/UART/readme.txt @@ -4,7 +4,7 @@ ** TARGET ** -The demo targets a generic ARM Cortex-A5 device without HAL support. +The demo runs on an SAMA5D2-XPLAINED board. ** The Demo ** -- cgit v1.2.3