From 8e1851be0ef7d20563085907460f9bb77ed2ebba Mon Sep 17 00:00:00 2001 From: edolomb Date: Fri, 16 Mar 2018 15:04:01 +0000 Subject: - Updated demos - Minor changes git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11778 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile | 27 +++++++++++--------------- demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c | 3 --- demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/readme.txt | 2 +- 3 files changed, 12 insertions(+), 20 deletions(-) (limited to 'demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED') diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile index a201e5e4b..6367c1c0b 100755 --- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile +++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/Makefile @@ -111,6 +111,9 @@ PROJECT = ch # 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 +136,13 @@ 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) \ +CSRC = $(ALLCSRC) \ $(TESTSRC) \ 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 +165,11 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +# List ASM source files here +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) # # Project, sources and paths @@ -224,10 +219,10 @@ CPPWARN = -Wall -Wextra -Wundef # # List all user C define here, like -D_DEBUG=1 -UDEFS = -DCH_CFG_USE_MMU +UDEFS = # Define ASM defines here -UADEFS = -DCH_CFG_USE_MMU +UADEFS = # List all user directories here UINCDIR = diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c index 57e6a72dc..3025f1b7f 100755 --- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c +++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c @@ -69,9 +69,6 @@ int main(void) { */ sdStart(&SD1, &sdcfg); - /* Redirecting UART0 RX on PD2 and UART0 TX on PD3. */ - palSetGroupMode(PIOD, PAL_PORT_BIT(2) | PAL_PORT_BIT(3), 0U, - PAL_SAMA_FUNC_PERIPH_A | PAL_MODE_SECURE); /* * Creates the blinker thread. */ diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/readme.txt b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/readme.txt index cc6e568f6..303da320d 100755 --- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/readme.txt +++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/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