karo: tx6: replace open coded interpretation of cpurev by calls to is_cpu_type()

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

diff --git a/board/karo/tx6/u-boot.lds b/board/karo/tx6/u-boot.lds
index 832cfb77d9568593e867d61d775ce54763230894..e7c9c38cdf12b352078fc1e26527f7538f6d9aca 100644 (file)
--- a/board/karo/tx6/u-boot.lds
+++ b/board/karo/tx6/u-boot.lds
@@ -24,51 +24,74 @@ OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
-        .text :
-        {
-                *(.__image_copy_start)
-                CPUDIR/start.o (.text*)
+       . = 0x00000000;
+       .text :
+       {
+               __uboot_img_start = .;
                . = 0x400;
-               KEEP(board/karo/tx6/lowlevel_init.o (.text*))
-                *(.text*)
-        }
+               __ivt_start = .;
+               KEEP(*(.ivt*))
+               . = 0x1000;
+               __ivt_end = .;
+               *(.__image_copy_start)
+               *(.vectors)
+               CPUDIR/start.o (.text*)
+               *(.text*)
+       } = 0xadde01f0
 
-        . = 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);
+       .data : {
+               *(.data*)
+               . = ALIGN(4);
+       }
 
-        . = ALIGN(4);
        .u_boot_list : {
                KEEP(*(SORT(.u_boot_list*)));
        }
 
-        . = ALIGN(4);
-        .image_copy_end :
+       . = ALIGN(4);
+       .image_copy_end :
        {
                *(.__image_copy_end)
        }
 
-        .rel_dyn_start :
+       .rel_dyn_start :
+       {
+               *(.__rel_dyn_start)
+       }
+
+       .rel.dyn :
        {
-                *(.__rel_dyn_start)
+               *(.rel*)
        }
 
-        .rel.dyn :
+       .rel_dyn_end :
        {
-                *(.rel*)
-        }
+               *(.__rel_dyn_end)
+       }
+
+       .pad :
+       {
+               *(.pad)
+               . = ALIGN(4096);
+       } = 0x01f0adde
 
-        .rel_dyn_end :
+       .uboot_img_end :
        {
-                *(.__rel_dyn_end)
+               KEEP(*(.__uboot_img_end))
        }
 
-        _end = .;
+#ifdef CONFIG_SECURE_BOOT
+       .csf_data :
+       {
+               *(.__csf_data)
+               . = . + 0x2000;
+       }
+#endif
+       __uboot_img_len = . - __uboot_img_start;
 
 /*
  * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -88,13 +111,17 @@ SECTIONS
        .bss_end __bss_limit (OVERLAY) : {
                KEEP(*(.__bss_end));
        }
- 
-       /DISCARD/ : { *(.bss*) }
+
+       /DISCARD/ : { *(.debug*) }
+       /DISCARD/ : { *(.note*) }
+       /DISCARD/ : { *(.comment*) }
+       /DISCARD/ : { *(.dynbss) }
        /DISCARD/ : { *(.dynstr*) }
-       /DISCARD/ : { *(.dynsym*) }
        /DISCARD/ : { *(.dynamic*) }
-       /DISCARD/ : { *(.hash*) }
        /DISCARD/ : { *(.plt*) }
        /DISCARD/ : { *(.interp*) }
+       /DISCARD/ : { *(.gnu.hash) }
        /DISCARD/ : { *(.gnu*) }
+       /DISCARD/ : { *(.ARM.exidx*) }
+       /DISCARD/ : { *(.gnu.linkonce.armexidx.*) }
 }