Merge branch 'tx6-bugfix'

[karo-tx-uboot.git] / board / karo / tx53 / u-boot.lds

diff --git a/board/karo/tx53/u-boot.lds b/board/karo/tx53/u-boot.lds
index 7842ff83a9fe436592e73a6e1a66c4467049e3a1..e010d99f533a82b5de24f89badb78080992ae895 100644 (file)
--- a/board/karo/tx53/u-boot.lds
+++ b/board/karo/tx53/u-boot.lds
@@ -24,59 +24,108 @@ OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+       . = 0x00000000;
+       .text :
+       {
+               __uboot_img_start = .;
+               . = 0x400;
+               __ivt_start = .;
+               KEEP(*(.ivt*))
+               . = 0x1000;
+               __ivt_end = .;
+               *(.__image_copy_start)
+               *(.vectors)
+               CPUDIR/start.o (.text*)
+               *(.text*)
+       } = 0xadde01f0
 
-        . = ALIGN(4);
-        .text :
-        {
-               board/karo/tx53/lowlevel_init.o (.text)
-                __image_copy_start = .;
-                CPUDIR/start.o (.text)
-                *(.text)
-        }
+       . = ALIGN(4);
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
-        . = ALIGN(4);
-        .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+       . = ALIGN(4);
+       .data : {
+               *(.data*)
+               . = ALIGN(4);
+       }
 
-        . = ALIGN(4);
-        .data : {
-                *(.data)
-        }
+       .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
+       }
 
-        . = ALIGN(4);
+       . = ALIGN(4);
+       .image_copy_end :
+       {
+               *(.__image_copy_end)
+       }
 
-        . = .;
-        __u_boot_cmd_start = .;
-        .u_boot_cmd : { *(.u_boot_cmd) }
-        __u_boot_cmd_end = .;
+       .rel_dyn_start :
+       {
+               *(.__rel_dyn_start)
+       }
 
-        . = ALIGN(4);
+       .rel.dyn :
+       {
+               *(.rel*)
+       }
 
-        __image_copy_end = .;
+       .rel_dyn_end :
+       {
+               *(.__rel_dyn_end)
+       }
 
-        .rel.dyn : {
-                __rel_dyn_start = .;
-                *(.rel*)
-                __rel_dyn_end = .;
-        }
+       .pad :
+       {
+               /* Workaround for a bug in i.MX53 ROM Code,
+                * which skips loading the last block if it doesn't
+                * end on a 4KiB boundary.
+                */
+               *(.pad)
+               . = ALIGN(4096);
+       } = 0x01f0adde
 
-        .dynsym : {
-                __dynsym_start = .;
-                *(.dynsym)
-        }
+       .uboot_img_end :
+       {
+               KEEP(*(.__uboot_img_end))
+       }
 
-        _end = .;
+#ifdef CONFIG_SECURE_BOOT
+       .csf_data :
+       {
+               *(.__csf_data)
+               . = . + 0x2000;
+       }
+#endif
+       __uboot_img_len = . - __uboot_img_start;
 
-        .bss __rel_dyn_start (OVERLAY) : {
-                __bss_start = .;
-                *(.bss)
-                 . = ALIGN(4);
-                __bss_end__ = .;
-        }
+/*
+ * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
+ * __bss_base and __bss_limit are for linker only (overlay ordering)
+ */
+
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+               __bss_base = .;
+       }
+
+       .bss __bss_base (OVERLAY) : {
+               *(.bss*)
+               . = ALIGN(4);
+               __bss_limit = .;
+       }
+       .bss_end __bss_limit (OVERLAY) : {
+               KEEP(*(.__bss_end));
+       }
 
-        /DISCARD/ : { *(.dynstr*) }
-        /DISCARD/ : { *(.dynamic*) }
-        /DISCARD/ : { *(.plt*) }
-        /DISCARD/ : { *(.interp*) }
-        /DISCARD/ : { *(.gnu*) }
+       /DISCARD/ : { *(.debug*) }
+       /DISCARD/ : { *(.note*) }
+       /DISCARD/ : { *(.comment*) }
+       /DISCARD/ : { *(.dynbss) }
+       /DISCARD/ : { *(.dynstr*) }
+       /DISCARD/ : { *(.dynamic*) }
+       /DISCARD/ : { *(.plt*) }
+       /DISCARD/ : { *(.interp*) }
+       /DISCARD/ : { *(.gnu.hash) }
+       /DISCARD/ : { *(.gnu*) }
+       /DISCARD/ : { *(.ARM.exidx*) }
+       /DISCARD/ : { *(.gnu.linkonce.armexidx.*) }
 }