Fixed ld scripts by adding a jump to _start.

darcs-hash:20050725080605-f2ef6-bcdea97cab289e85b48338a30fcc4d6db8acd87d.gz

diff --git a/board/h8300/h8canusb/libs/Makefile.omk b/board/h8300/h8canusb/libs/Makefile.omk
index 74e8d6618c0638dea3b009ed76408f84ec849822..0915604446abc3560b09bff4f5f395cf4583ab7a 100644 (file)
--- a/board/h8300/h8canusb/libs/Makefile.omk
+++ b/board/h8300/h8canusb/libs/Makefile.omk
@@ -1,3 +1,3 @@
 # -*- makefile -*-
 lib_LDSCRIPTS = $(notdir $(wildcard $(SOURCES_DIR)/*.ld*))
-ldscript_ADD_PREFIX_PATH = crt0\.o
+# ldscript_ADD_PREFIX_PATH = crt0\.o

diff --git a/board/h8300/h8canusb/libs/edk2638.ld-boot b/board/h8300/h8canusb/libs/edk2638.ld-boot
index cfa2064dfe00062645f84199eced6e32a0e17a8c..055128c730bb7612095042754923aa9d73394606 100644 (file)
--- a/board/h8300/h8canusb/libs/edk2638.ld-boot
+++ b/board/h8300/h8canusb/libs/edk2638.ld-boot
@@ -4,7 +4,7 @@ INCLUDE "edk2638.ld-cfg"
 
 PROVIDE( ___stack_top = ( __iram0_end & ~ 3 ) - 4 );
 
-/* STARTUP(crt0.o) */
+STARTUP(crt0.o)
 
 SECTIONS
 {

diff --git a/board/h8300/h8canusb/libs/edk2638.ld-flash b/board/h8300/h8canusb/libs/edk2638.ld-flash
index dabbef6adcdf9555ad450ba0fc6e9e30713dacc7..260277c958c4dfd7a9d1c76431291bae9766b70c 100644 (file)
--- a/board/h8300/h8canusb/libs/edk2638.ld-flash
+++ b/board/h8300/h8canusb/libs/edk2638.ld-flash
@@ -7,14 +7,16 @@ INCLUDE "edk2638.ld-cfg"
 PROVIDE( ___stack_top = ( __iram0_end & ~ 3 ) - 4 );
 PROVIDE( ___heap_end = __ram_end );
 
-/* STARTUP(crt0.o) */
+STARTUP(crt0.o)
 
 SECTIONS
 {
        .text :
        {
+         . = ALIGN( 4 ) ;
          text_start = . ;
-         KEEP (crt0*(.text))
+         LONG( ABSOLUTE( _start ) + 0x5a000000 ) /* JMP _start */
+/*       KEEP (crt0.o(.text)) */
          . = ALIGN( 4 ) ;
          ___boot_fn_start = ALIGN( 0x4 ) ;
           KEEP (*boot_fn.o(.text))

diff --git a/board/h8300/h8canusb/libs/edk2638.ld-ram b/board/h8300/h8canusb/libs/edk2638.ld-ram
index bb2d7ba51f637bbd928563c0d242c41f72026ff0..943ce843f14aca5ae435dfdee6776f1c2a8660c7 100644 (file)
--- a/board/h8300/h8canusb/libs/edk2638.ld-ram
+++ b/board/h8300/h8canusb/libs/edk2638.ld-ram
@@ -9,14 +9,16 @@ INCLUDE "edk2638.ld-cfg"
 PROVIDE( ___stack_top = ( __iram0_end & ~ 3 ) - 4 );
 PROVIDE( ___heap_end = __ram_end );
 
-/* STARTUP(crt0.o) */
+STARTUP(crt0.o)
 
 SECTIONS
 {
        .text :
        {
+         . = ALIGN( 4 ) ;
          text_start = . ;
-         KEEP (crt0*(.text))
+         LONG( ABSOLUTE( _start ) + 0x5a000000 ) /* JMP _start */
+/*       KEEP (crt0.o(.text)) */
          . = ALIGN( 4 ) ;
          ___boot_fn_start = ALIGN( 0x4 ) ;
           KEEP (*boot_fn.o(.text))

diff --git a/board/h8300/h8canusb/libs/id_cpu1.ld-flash b/board/h8300/h8canusb/libs/id_cpu1.ld-flash
index 2d6cac4755f002dc8018577260b9bb072c582b2f..3a915ea95c33d914858d0e659b742be9604d52fd 100644 (file)
--- a/board/h8300/h8canusb/libs/id_cpu1.ld-flash
+++ b/board/h8300/h8canusb/libs/id_cpu1.ld-flash
@@ -13,8 +13,10 @@ SECTIONS
 {
        .text :
        {
+         . = ALIGN( 4 ) ;
          text_start = . ;
-         KEEP (crt0.o(.text))
+         LONG( ABSOLUTE( _start ) + 0x5a000000 ) /* JMP _start */
+/*       KEEP (crt0.o(.text)) */
          . = ALIGN( 4 ) ;
          ___boot_fn_start = ALIGN( 0x4 ) ;
           KEEP (*boot_fn.o(.text))

diff --git a/board/h8300/h8canusb/libs/id_cpu1.ld-ram b/board/h8300/h8canusb/libs/id_cpu1.ld-ram
index 16d8bd0cb635dc99a873e931e66dd8f82a6914b1..e562810f05866e6a8fb9bceacc55896e2a6e5d9f 100644 (file)
--- a/board/h8300/h8canusb/libs/id_cpu1.ld-ram
+++ b/board/h8300/h8canusb/libs/id_cpu1.ld-ram
@@ -15,8 +15,10 @@ SECTIONS
 {
        .text :
        {
+         . = ALIGN( 4 ) ;
          text_start = . ;
-         KEEP (crt0.o(.text))
+         LONG( ABSOLUTE( _start ) + 0x5a000000 ) /* JMP _start */
+/*       KEEP (crt0.o(.text)) */
          . = ALIGN( 4 ) ;
          ___boot_fn_start = ALIGN( 0x4 ) ;
           KEEP (*boot_fn.o(.text))