Split cpu specific flags and files; modify mk template.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2877 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/arm/info/AT91SAM7S128.cdef b/bertos/cpu/arm/info/AT91SAM7S128.cdef
index cf7bbefae32a39bdb469ae7270bce0c41c6e2eb2..b825fa3f0d09c5419940bb799543be61e622a35f 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S128.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S128.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "128 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7S128__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_128_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_128_rom.ld"
 

diff --git a/bertos/cpu/arm/info/AT91SAM7S256.cdef b/bertos/cpu/arm/info/AT91SAM7S256.cdef
index 0d39a4516300519238bad9b8b050d7de2a98ece9..3e7c3bd889e896350764041c45d6e9ac0f01c346 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S256.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S256.cdef
@@ -49,6 +49,6 @@ CPU_DESC += [ "256 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7S256__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_256_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_256_rom.ld"
 
 

diff --git a/bertos/cpu/arm/info/AT91SAM7S512.cdef b/bertos/cpu/arm/info/AT91SAM7S512.cdef
index 4f3154c61035908e55b4865eed0e6da045e64d8f..33ee75ecc24f2d18e0758543dc327fd94cc7a1bb 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S512.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S512.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "512 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7S512__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_512_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_512_rom.ld"
 

diff --git a/bertos/cpu/arm/info/AT91SAM7S64.cdef b/bertos/cpu/arm/info/AT91SAM7S64.cdef
index 50ffdfef1c7dd9c8889644afea35068efda69fcb..1675dcb489b2cc1f49f378e673955a806a9b843b 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7S64.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7S64.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "64 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7S64__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_64_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_64_rom.ld"
 

diff --git a/bertos/cpu/arm/info/AT91SAM7X128.cdef b/bertos/cpu/arm/info/AT91SAM7X128.cdef
index 6b94b7764ecbc62ac7b50a515700f17d9592b05e..3f7920e739708169f92762efbb39779311f22ed8 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X128.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X128.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "128 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7X128__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_128_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_128_rom.ld"
 

diff --git a/bertos/cpu/arm/info/AT91SAM7X256.cdef b/bertos/cpu/arm/info/AT91SAM7X256.cdef
index e0b8d8e7075626369d390343adb54f95331292f1..d52e940b2d8ef2888285f93a826483c6681c49dd 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X256.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X256.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "256 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7X256__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_256_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_256_rom.ld"
 

diff --git a/bertos/cpu/arm/info/AT91SAM7X512.cdef b/bertos/cpu/arm/info/AT91SAM7X512.cdef
index 2329a1fbdd0acaa2fc3b685e4346e9157af4215f..547b456a6d54f8f165f271516862f79a66496f0f 100644 (file)
--- a/bertos/cpu/arm/info/AT91SAM7X512.cdef
+++ b/bertos/cpu/arm/info/AT91SAM7X512.cdef
@@ -49,5 +49,5 @@ CPU_DESC += [ "512 Kbytes internal flash memory",
 
 # GCC flags for this cpu.
 MK_CPU_CPPFLAGS += " -D__ARM_AT91SAM7X512__"
-MK_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_512_rom.ld"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "at91sam7_512_rom.ld"
 

diff --git a/bertos/cpu/arm/info/at91sam7.common b/bertos/cpu/arm/info/at91sam7.common
index b07163860ee35f299003532584ceee46b3ab0e9c..1f3f9cb8173cf7d589cf36eded96ba1dd08f2af8 100644 (file)
--- a/bertos/cpu/arm/info/at91sam7.common
+++ b/bertos/cpu/arm/info/at91sam7.common
@@ -76,9 +76,9 @@ MK_DEBUG_SCRIPT = PRG_SCRIPTS_DIR + "arm/debug.sh"
 GDB_INIT_SCRIPT = PRG_SCRIPTS_DIR + "arm/openocd/gdbinit-sam7"
 
 # Common GCC flags.
-MK_CPPAFLAGS = "-O0 -g -gdwarf-2 -g -gen-debug"
+MK_CPU_CPPAFLAGS = "-O0 -g -gdwarf-2 -g -gen-debug"
 MK_CPU_CPPFLAGS = "-O0 -g3 -gdwarf-2 -fverbose-asm -I" + CPU_DIR + "arm/"
-MK_LDFLAGS = "-nostartfiles -Wl,--no-warn-mismatch"
+MK_CPU_LDFLAGS = "-nostartfiles -Wl,--no-warn-mismatch"
 
 # CRT file.
-MK_CPPASRC = HW_DIR + "crtat91sam7_rom.S"
+MK_CPU_CPPASRC = HW_DIR + "crtat91sam7_rom.S"

diff --git a/wizard/mktemplates/template_wiz.mk b/wizard/mktemplates/template_wiz.mk
index 3b97acae55ed1c96dcb8f0b151b20e91c5e0b4a7..67e37ad8307f33c86680fb11e533571aa48ab051 100644 (file)
--- a/wizard/mktemplates/template_wiz.mk
+++ b/wizard/mktemplates/template_wiz.mk
@@ -46,16 +46,22 @@ $pname_WIZARD_ASRC = \
 $pname_CPPFLAGS = -D'CPU_FREQ=($cpuclockfreqUL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$pname/ $($pname_CPU_CPPFLAGS)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CSRC = $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
+$pname_LDFLAGS = $($pname_CPU_LDFLAGS) $($pname_WIZARD_LDFLAGS) $($pname_USER_LDFLAGS) 
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
+$pname_CPPAFLAGS = $($pname_CPU_CPPAFLAGS) $($pname_WIZARD_CPPAFLAGS) $($pname_USER_CPPAFLAGS) 
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
+$pname_CSRC = $($pname_CPU_CSRC) $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+$pname_PCSRC = $($pname_CPU_PCSRC) $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
+$pname_CPPASRC = $($pname_CPU_CPPASRC) $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CXXSRC = $($pname_CPU_CXXSRC) $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_ASRC = $($pname_CPU_ASRC) $($pname_WIZARD_ASRC) $($pname_USER_ASRC)