From: lottaviano Date: Fri, 4 Sep 2009 09:52:11 +0000 (+0000) Subject: Split cpu specific flags and files; modify mk template. X-Git-Tag: 2.2.0~91 X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=commitdiff_plain;h=d15dda9b9403846204a3ade72aac639e95714685 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 cf7bbefa..b825fa3f 100644 --- 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 0d39a451..3e7c3bd8 100644 --- 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 4f3154c6..33ee75ec 100644 --- 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 50ffdfef..1675dcb4 100644 --- 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 6b94b776..3f7920e7 100644 --- 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 e0b8d8e7..d52e940b 100644 --- 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 2329a1fb..547b456a 100644 --- 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 b0716386..1f3f9cb8 100644 --- 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 3b97acae..67e37ad8 100644 --- 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)