git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5527 35acf78f-673a-0410-8e92-d51de3d6d3f4

2013-04-02 09:02:40 +00:00 · 2013-04-02 09:02:40 +00:00 · 8813e1654c
parent 356fb1a2a0
commit 8813e1654c
24 changed files with 90 additions and 12 deletions
--- a/demos/PPC-SPC560B-GCC/Makefile
+++ b/demos/PPC-SPC560B-GCC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/demos/PPC-SPC560P-GCC/Makefile
+++ b/demos/PPC-SPC560P-GCC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/demos/PPC-SPC563M-GCC/Makefile
+++ b/demos/PPC-SPC563M-GCC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/demos/PPC-SPC564A-GCC/Makefile
+++ b/demos/PPC-SPC564A-GCC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/demos/PPC-SPC56EL-GCC/Makefile
+++ b/demos/PPC-SPC56EL-GCC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/os/ports/GCC/PPC/SPC560BCxx/bam.s
+++ b/os/ports/GCC/PPC/SPC560BCxx/bam.s
@ -31,9 +31,12 @@
        /* BAM record.*/
        .section    .bam, "ax"
        .long       0x015A0000
-        .long       .init
+        .long       _reset_address

-.init:
+        .align      2
+        .globl      _reset_address
+        .type       _reset_address, @function
+_reset_address:
        bl          _coreinit
        bl          _ivinit

--- a/os/ports/GCC/PPC/SPC560BCxx/ld/SPC560B44.ld
+++ b/os/ports/GCC/PPC/SPC560BCxx/ld/SPC560B44.ld
@ -31,6 +31,8 @@ MEMORY
    ram       : org = 0x40000000, len = 28k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC560BCxx/ld/SPC560B50.ld
+++ b/os/ports/GCC/PPC/SPC560BCxx/ld/SPC560B50.ld
@ -31,6 +31,8 @@ MEMORY
    ram       : org = 0x40000000, len = 32k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC560Pxx/bam.s
+++ b/os/ports/GCC/PPC/SPC560Pxx/bam.s
@ -31,9 +31,12 @@
        /* BAM record.*/
        .section    .bam, "ax"
        .long       0x015A0000
-        .long       .init
+        .long       _reset_address

-.init:
+        .align      2
+        .globl      _reset_address
+        .type       _reset_address, @function
+_reset_address:
        bl          _coreinit
        bl          _ivinit

--- a/os/ports/GCC/PPC/SPC560Pxx/ld/SPC560P44.ld
+++ b/os/ports/GCC/PPC/SPC560Pxx/ld/SPC560P44.ld
@ -31,6 +31,8 @@ MEMORY
    ram       : org = 0x40000000, len = 36k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC560Pxx/ld/SPC560P50.ld
+++ b/os/ports/GCC/PPC/SPC560Pxx/ld/SPC560P50.ld
@ -31,6 +31,8 @@ MEMORY
    ram       : org = 0x40000000, len = 40k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC563Mxx/bam.s
+++ b/os/ports/GCC/PPC/SPC563Mxx/bam.s
@ -35,9 +35,12 @@
 #else
        .long       0x005A0000
 #endif
-        .long       .init
+        .long       _reset_address

-.init:
+        .align      2
+        .globl      _reset_address
+        .type       _reset_address, @function
+_reset_address:
        bl          _coreinit
        bl          _ivinit

--- a/os/ports/GCC/PPC/SPC563Mxx/ld/SPC563M64.ld
+++ b/os/ports/GCC/PPC/SPC563Mxx/ld/SPC563M64.ld
@ -30,6 +30,8 @@ MEMORY
    ram   : org = 0x40000000, len = 94k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC564Axx/bam.s
+++ b/os/ports/GCC/PPC/SPC564Axx/bam.s
@ -35,9 +35,12 @@
 #else
        .long       0x005A0000
 #endif
-        .long       .init
+        .long       _reset_address

-.init:
+        .align      2
+        .globl      _reset_address
+        .type       _reset_address, @function
+_reset_address:
        bl          _coreinit
        bl          _ivinit

--- a/os/ports/GCC/PPC/SPC564Axx/ld/SPC564A80.ld
+++ b/os/ports/GCC/PPC/SPC564Axx/ld/SPC564A80.ld
@ -30,6 +30,8 @@ MEMORY
    ram   : org = 0x40000000, len = 192k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC56ELxx/bam.s
+++ b/os/ports/GCC/PPC/SPC56ELxx/bam.s
@ -35,9 +35,12 @@
 #else
        .long       0x005A0000
 #endif
-        .long       .init
+        .long       _reset_address

-.init:
+        .align      2
+        .globl      _reset_address
+        .type       _reset_address, @function
+_reset_address:
        bl          _coreinit
        bl          _ivinit

--- a/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL54_LSM.ld
+++ b/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL54_LSM.ld
@ -30,6 +30,8 @@ MEMORY
    ram       : org = 0x40000000, len = 128k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL60_LSM.ld
+++ b/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL60_LSM.ld
@ -30,6 +30,8 @@ MEMORY
    ram       : org = 0x40000000, len = 128k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL70_LSM.ld
+++ b/os/ports/GCC/PPC/SPC56ELxx/ld/SPC56EL70_LSM.ld
@ -30,6 +30,8 @@ MEMORY
    ram       : org = 0x40000000, len = 192k
 }

+ENTRY(_reset_address)
+
 /*
 * Derived constants.
 */
--- a/os/ports/GCC/PPC/rules.mk
+++ b/os/ports/GCC/PPC/rules.mk
@ -62,9 +62,9 @@ ASXFLAGS  = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
 CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
 CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
 ifeq ($(USE_LINK_GC),yes)
-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LLIBDIR)
+  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections,$(USE_LDOPT) $(LLIBDIR)
 else
-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch $(LLIBDIR)
+  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,$(USE_LDOPT) $(LLIBDIR)
 endif

 # Generate dependency information
--- a/testhal/SPC560Pxx/PWM-ICU/Makefile
+++ b/testhal/SPC560Pxx/PWM-ICU/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/testhal/SPC563Mxx/ADC/Makefile
+++ b/testhal/SPC563Mxx/ADC/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/testhal/SPC563Mxx/SPI/Makefile
+++ b/testhal/SPC563Mxx/SPI/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes
--- a/testhal/SPC56ELxx/PWM-ICU/Makefile
+++ b/testhal/SPC56ELxx/PWM-ICU/Makefile
@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
  USE_LINK_GC = yes
 endif

+# Linker options here.
+ifeq ($(USE_LDOPT),)
+  USE_LDOPT = 
+endif
+
 # If enabled, this option allows to compile the application in VLE mode.
 ifeq ($(USE_VLE),)
  USE_VLE = yes