diff options
| author | flabbergast <s3+flabbergast@sdfeu.org> | 2016-04-14 19:25:02 +0100 |
|---|---|---|
| committer | flabbergast <s3+flabbergast@sdfeu.org> | 2016-04-24 16:38:04 +0100 |
| commit | a109d62f0ac2da3dbf6cf1ac28ae99ec30f0d6c1 (patch) | |
| tree | 79b944697f495f46bb9b8b5ae4db1b27dc743254 /testhal/KINETIS | |
| parent | c35568fafc579061a8565669c106a4fcc32d8681 (diff) | |
| download | ChibiOS-Contrib-a109d62f0ac2da3dbf6cf1ac28ae99ec30f0d6c1.tar.gz ChibiOS-Contrib-a109d62f0ac2da3dbf6cf1ac28ae99ec30f0d6c1.tar.bz2 ChibiOS-Contrib-a109d62f0ac2da3dbf6cf1ac28ae99ec30f0d6c1.zip | |
[KINETIS] Update Makefiles to use shell.mk.
Diffstat (limited to 'testhal/KINETIS')
| -rw-r--r-- | testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile | 11 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile | 9 | ||||
| -rw-r--r-- | testhal/KINETIS/MCHCK/USB_SERIAL/Makefile | 11 | ||||
| -rw-r--r-- | testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile | 11 | ||||
| -rw-r--r-- | testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile.3_0 | 11 |
5 files changed, 29 insertions, 24 deletions
diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile index e738944..7e0b16f 100644 --- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile +++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile @@ -95,6 +95,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/MKL2xZ128.ld
@@ -109,11 +111,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- usbcfg.c \ + $(STREAMSSRC) \
+ $(SHELLSRC) \
+ usbcfg.c \
main.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/os/various/shell/shell_cmd.c \ - $(CHIBIOS)/os/various/shell/shell.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -144,7 +145,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various/shell $(CHIBIOS)/os/hal/lib/streams
+ $(STREAMSINC) $(SHELLINC)
#
# Project, sources and paths
diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile index 7ea082f..07ba0b8 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile @@ -95,6 +95,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/MKL2xZ128.ld
@@ -109,11 +111,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
+ $(STREAMSSRC) \
+ $(SHELLSRC) \
main.c \
usbcfg.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/os/various/shell/shell_cmd.c \
- $(CHIBIOS)/os/various/shell/shell.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -144,7 +145,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various/shell $(CHIBIOS)/os/hal/lib/streams
+ $(STREAMSINC) $(SHELLINC)
#
# Project, sources and paths
diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile index b3010a1..8371c17 100644 --- a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile +++ b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile @@ -100,6 +100,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
# Use BLDR4 for a 4k bootloader, BLDR3 for a 3k bootloader
@@ -115,11 +117,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- usbcfg.c \ + $(STREAMSSRC) \
+ $(SHELLSRC) \
+ usbcfg.c \
main.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/os/various/shell/shell_cmd.c \ - $(CHIBIOS)/os/various/shell/shell.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -150,7 +151,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various/shell $(CHIBIOS)/os/hal/lib/streams
+ $(STREAMSINC) $(SHELLINC)
#
# Project, sources and paths
diff --git a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile index 32688b5..c4599fd 100644 --- a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile +++ b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile @@ -100,6 +100,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/MK20DX256.ld
@@ -114,11 +116,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- usbcfg.c \ + $(STREAMSSRC) \
+ $(SHELLSRC) \
+ usbcfg.c \
main.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/os/various/shell/shell_cmd.c \ - $(CHIBIOS)/os/various/shell/shell.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -149,7 +150,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various/shell $(CHIBIOS)/os/hal/lib/streams
+ $(STREAMSINC) $(SHELLINC)
#
# Project, sources and paths
diff --git a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile.3_0 b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile.3_0 index 87c6d9f..fb95966 100644 --- a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile.3_0 +++ b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile.3_0 @@ -100,6 +100,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/MK20DX128.ld
@@ -114,11 +116,10 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- usbcfg.c \ + $(STREAMSSRC) \
+ $(SHELLSRC) \
+ usbcfg.c \
main.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
- $(CHIBIOS)/os/various/shell/shell_cmd.c \ - $(CHIBIOS)/os/various/shell/shell.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -149,7 +150,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various/shell $(CHIBIOS)/os/hal/lib/streams
+ $(STREAMSINC) $(SHELLINC)
#
# Project, sources and paths
|