arc: cache: Add required NOPs after invalidation of instruction cache

[people/ms/u-boot.git] / arch / arc / lib / relocate.c

diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c
index 956aa1494e1649275044154c26b31de5c090ff17..7802f4054594fcfa311225c542eef9256d27c4f0 100644 (file)
--- a/arch/arc/lib/relocate.c
+++ b/arch/arc/lib/relocate.c
@@ -6,10 +6,32 @@
 
 #include <common.h>
 #include <elf.h>
-#include <asm/sections.h>
+#include <asm-generic/sections.h>
+
+extern ulong __image_copy_start;
+extern ulong __ivt_end;
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int copy_uboot_to_ram(void)
+{
+       size_t len = (size_t)&__image_copy_end - (size_t)&__image_copy_start;
+
+       memcpy((void *)gd->relocaddr, (void *)&__image_copy_start, len);
+
+       return 0;
+}
+
+int clear_bss(void)
+{
+       ulong dst_addr = (ulong)&__bss_start + gd->reloc_off;
+       size_t len = (size_t)&__bss_end - (size_t)&__bss_start;
+
+       memset((void *)dst_addr, 0x00, len);
+
+       return 0;
+}
+
 /*
  * Base functionality is taken from x86 version with added ARC-specifics
  */
@@ -18,6 +40,9 @@ int do_elf_reloc_fixups(void)
        Elf32_Rela *re_src = (Elf32_Rela *)(&__rel_dyn_start);
        Elf32_Rela *re_end = (Elf32_Rela *)(&__rel_dyn_end);
 
+       debug("Section .rela.dyn is located at %08x-%08x\n",
+             (unsigned int)re_src, (unsigned int)re_end);
+
        Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
        Elf32_Addr *offset_ptr_ram;
 
@@ -26,13 +51,17 @@ int do_elf_reloc_fixups(void)
                offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
 
                /* Check that the location of the relocation is in .text */
-               if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE &&
+               if (offset_ptr_rom >= (Elf32_Addr *)&__image_copy_start &&
                    offset_ptr_rom > last_offset) {
                        unsigned int val;
                        /* Switch to the in-RAM version */
                        offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
                                                        gd->reloc_off);
 
+                       debug("Patching value @ %08x (relocated to %08x)\n",
+                             (unsigned int)offset_ptr_rom,
+                             (unsigned int)offset_ptr_ram);
+
                        /*
                         * Use "memcpy" because target location might be
                         * 16-bit aligned on ARC so we may need to read
@@ -41,28 +70,25 @@ int do_elf_reloc_fixups(void)
                         */
                        memcpy(&val, offset_ptr_ram, sizeof(int));
 
+#ifdef __LITTLE_ENDIAN__
                        /* If location in ".text" section swap value */
                        if ((unsigned int)offset_ptr_rom <
-                           (unsigned int)&__text_end)
+                           (unsigned int)&__ivt_end)
                                val = (val << 16) | (val >> 16);
+#endif
 
-                       /* Check that the target points into .text */
-                       if (val >= CONFIG_SYS_TEXT_BASE && val <=
-                           (unsigned int)&__bss_end) {
+                       /* Check that the target points into executable */
+                       if (val >= (unsigned int)&__image_copy_start && val <=
+                           (unsigned int)&__image_copy_end) {
                                val += gd->reloc_off;
+#ifdef __LITTLE_ENDIAN__
                                /* If location in ".text" section swap value */
                                if ((unsigned int)offset_ptr_rom <
-                                   (unsigned int)&__text_end)
+                                   (unsigned int)&__ivt_end)
                                        val = (val << 16) | (val >> 16);
+#endif
                                memcpy(offset_ptr_ram, &val, sizeof(int));
-                       } else {
-                               debug("   %p: rom reloc %x, ram %p, value %x, limit %x\n",
-                                     re_src, re_src->r_offset, offset_ptr_ram,
-                                     val, (unsigned int)&__bss_end);
                        }
-               } else {
-                       debug("   %p: rom reloc %x, last %p\n", re_src,
-                             re_src->r_offset, last_offset);
                }
                last_offset = offset_ptr_rom;