- Updated demos

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11782 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
edolomb 2018-03-16 16:36:47 +00:00
parent 7b6a255a2c
commit 259f9cace1
3 changed files with 14 additions and 27 deletions

View File

@ -108,9 +108,14 @@ endif
# Define project name here # Define project name here
PROJECT = ch PROJECT = ch
BUILDDIR := ./build
DEPDIR := ./.dep
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../.. CHIBIOS = ../../..
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk include $(CHIBIOS)/os/common/startup/ARMCAx-TZ/compilers/GCC/mk/startup_sama5d2.mk
# HAL-OSAL files (optional). # 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/lib/test.mk
#include $(CHIBIOS)/test/rt/rt_test.mk #include $(CHIBIOS)/test/rt/rt_test.mk
#include $(CHIBIOS)/test/oslib/oslib_test.mk #include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here # Define linker script file here
#LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld #LDSCRIPT= $(STARTUPLD)/SAMA5D2.ld
@ -133,21 +139,13 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = $(STARTUPSRC) \ CSRC = $(ALLCSRC) \
$(KERNSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
$(CHIBIOS)/os/various/syscalls.c \ $(CHIBIOS)/os/various/syscalls.c \
main.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CPPSRC = CPPSRC = $(ALLCPPSRC)
# C sources to be compiled in ARM mode regardless of the global setting. # C sources to be compiled in ARM mode regardless of the global setting.
# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@ -170,13 +168,10 @@ TCSRC =
TCPPSRC = TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = ASMSRC = $(ALLASMSRC)
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(ALLXASMSRC)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(ALLINC) $(CHIBIOS)/os/various
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
# #
# Project, sources and paths # Project, sources and paths

View File

@ -77,10 +77,6 @@ int main(void) {
*/ */
sdStart(&SD1, &sdcfg); sdStart(&SD1, &sdcfg);
/* 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);
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO , Thread1, NULL); chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO , Thread1, NULL);
/* /*

View File

@ -140,12 +140,8 @@ LDSCRIPT= $(STARTUPLD)/SAMA5D2ddr.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = $(ALLCSRC) main.c fat32test.c reledgetest.c redconf.c CSRC = $(ALLCSRC) /os/various/syscalls.c \
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 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
@ -176,7 +172,7 @@ ASMSRC = $(ALLASMSRC)
ASMXSRC = $(ALLXASMSRC) ASMXSRC = $(ALLXASMSRC)
INCDIR = $(ALLINC) \ INCDIR = $(ALLINC) \
$(FATFSINC) $(RELEDGEINC) $(CHIBIOS)/os/various $(FATFSINC) $(RELEDGEINC)
# #
# Project, sources and paths # Project, sources and paths