[KINETIS] Mass update Makefile (license & asm changes).

8 files changed, 33 insertions, 18 deletions

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
index 1453c5e..c8818bf 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
@@ -141,9 +141,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile b/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
index 1453c5e..c8818bf 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
@@ -141,9 +141,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
index 4dc2677..0ce214c 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
@@ -94,7 +94,6 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 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

 

 # Define linker script file here

 LDSCRIPT = $(STARTUPLD)/MKL2xZ128.ld

@@ -136,9 +135,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
index 8366acd..b9dd9f7 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
@@ -141,9 +141,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(STREAMSINC) $(SHELLINC)

 

@@ -155,7 +157,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 # Compiler settings

 #

 

-MCU  = cortex-m0

+MCU  = cortex-m0plus

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
index 4dc2677..00ca08c 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
@@ -136,9 +136,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
index e38ba95..5039ff3 100644
--- a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
+++ b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
@@ -142,9 +142,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
index e38ba95..5039ff3 100644
--- a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
+++ b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
@@ -142,9 +142,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various

 

diff --git a/demos/KINETIS/RT-TEENSY3/Makefile b/demos/KINETIS/RT-TEENSY3/Makefile
index 36145ce..5f23627 100644
--- a/demos/KINETIS/RT-TEENSY3/Makefile
+++ b/demos/KINETIS/RT-TEENSY3/Makefile
@@ -141,9 +141,11 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

 

-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various