From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 16 Mar 2011 07:53:45 +0000 (+0100)
Subject: h8300: Update h8canusb ld scripts to work with updated bootloader
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/42ddf4f6ed1bbbde627dad0a4bf659399eae28cd

h8300: Update h8canusb ld scripts to work with updated bootloader
---

diff --git a/board/h8300/h8canusb/libs/h8canusb.ld-boot b/board/h8300/h8canusb/libs/h8canusb.ld-boot
index c562669..ba40806 100644
--- a/board/h8300/h8canusb/libs/h8canusb.ld-boot
+++ b/board/h8300/h8canusb/libs/h8canusb.ld-boot
@@ -28,18 +28,24 @@ SECTIONS
 	{
 	  text_start = . ;
 	  KEEP (crt0.o(.text))
+          *(EXCLUDE_FILE(*boot_fn.o) .text)
+	  *(EXCLUDE_FILE(*boot_fn.o) .rodata) 				
+	  *(EXCLUDE_FILE(*boot_fn.o) .text .stub .text.* .gnu.linkonce.t.*)
+	  *(EXCLUDE_FILE(*boot_fn.o) .rodata .rodata.* .gnu.linkonce.r.*)
+	  *(EXCLUDE_FILE(*boot_fn.o) .strings)
+	  . = ALIGN( 0x4 ) ;
+	  _etext = ALIGN( 0x4 ) ;
+        } > flashbb
+	.text.boot_fn :
+	{
 	  . = ALIGN( 4 ) ;
 	  ___boot_fn_start = ALIGN( 0x4 ) ;
-          KEEP (*boot_fn.o(.text))
-	  KEEP (*boot_fn.o(.rodata))
+          KEEP (boot_fn.o(.text))
+	  KEEP (boot_fn.o(.rodata))
+	  KEEP (boot_fn.o(.strings))
 	  . = ALIGN( 4 ) ;
 	  ___boot_fn_end = ALIGN( 0x4 ) ;
-	  *(.text .stub .text.* .gnu.linkonce.t.*)
-	  *(.rodata .rodata.* .gnu.linkonce.r.*)
-	  *(.strings)
-	  . = ALIGN( 0x4 ) ;
-	  _etext = ALIGN( 0x4 ) ;
-        } > flashbb
+	} > bloader AT>flashbb
 
 	.tors : 
 	{