Merge branch 'tx53-bugfix' into uboot-merge

diff --git a/board/karo/tx53/lowlevel_init.S b/board/karo/tx53/lowlevel_init.S
index b547eae9e073756afa2015ae53c49102e9130ef6..b530fdb91d50c80952c69d837d79fd5a46cd5483 100644 (file)
--- a/board/karo/tx53/lowlevel_init.S
+++ b/board/karo/tx53/lowlevel_init.S
@@ -372,7 +372,7 @@ app_code_csf:
 boot_data:
        .long   fcb_start
 image_len:
-       .long   __rel_dyn_end - fcb_start
+       .long   __uboot_img_end - fcb_start
 plugin:
        .word   0
 ivt_end:

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 32d541e765346e8860182c2bdddb2f2a92378599..df666fcfa1b70cae2f9064e60928dbbd7feccfa3 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -58,6 +58,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define TX53_SDHC_PAD_CTRL     MUX_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_DSE_HIGH |   \
                                PAD_CTL_SRE_FAST | PAD_CTL_PUS_47K_UP)
 
+char __uboot_img_end[0] __attribute__((section(".__uboot_img_end")));
+
 static iomux_v3_cfg_t tx53_pads[] = {
        /* NAND flash pads are set up in lowlevel_init.S */
 

diff --git a/board/karo/tx53/u-boot.lds b/board/karo/tx53/u-boot.lds
index 1ce1e2ff87383ea7bfad11a5d32bfa9fa16f25d4..9276d3b130c121296edfcd0b55aa192bdc0dcbd9 100644 (file)
--- a/board/karo/tx53/u-boot.lds
+++ b/board/karo/tx53/u-boot.lds
@@ -62,14 +62,19 @@ SECTIONS
                *(.rel*)
        }
 
+       .rel_dyn_end :
+       {
+               *(.__rel_dyn_end)
+       }
+
        /* Workaround for an apparent bug in i.MX53 ROM Code,
         * that skips loading the last block if it doesn't
         * end on a 4KiB boundary.
         */
        . = ALIGN(4096);
-       .rel_dyn_end :
+       .uboot_img_end :
        {
-               *(.__rel_dyn_end)
+               *(.__uboot_img_end)
        }
 
        _end = .;