Add GPL-2.0+ SPDX-License-Identifier to source files

[karo-tx-uboot.git] / arch / x86 / lib / relocate.c

diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 200baaba6a2707c28fabc82cb93054158cdff5c0..526daaf93a639194e693ef8fd5f5d6486f256721 100644 (file)
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -12,31 +12,19 @@
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <mgroeger@sysgo.de>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <libfdt.h>
 #include <malloc.h>
 #include <asm/u-boot-x86.h>
 #include <asm/relocate.h>
+#include <asm/sections.h>
 #include <elf.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int copy_uboot_to_ram(void)
 {
        size_t len = (size_t)&__data_end - (size_t)&__text_start;
@@ -46,6 +34,22 @@ int copy_uboot_to_ram(void)
        return 0;
 }
 
+int copy_fdt_to_ram(void)
+{
+       if (gd->new_fdt) {
+               ulong fdt_size;
+
+               fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
+
+               memcpy(gd->new_fdt, gd->fdt_blob, fdt_size);
+               debug("Relocated fdt from %p to %p, size %lx\n",
+                      gd->fdt_blob, gd->new_fdt, fdt_size);
+               gd->fdt_blob = gd->new_fdt;
+       }
+
+       return 0;
+}
+
 int clear_bss(void)
 {
        ulong dst_addr = (ulong)&__bss_start + gd->reloc_off;
@@ -56,12 +60,16 @@ int clear_bss(void)
        return 0;
 }
 
+/*
+ * This function has more error checking than you might expect. Please see
+ * the commit message for more informaiton.
+ */
 int do_elf_reloc_fixups(void)
 {
        Elf32_Rel *re_src = (Elf32_Rel *)(&__rel_dyn_start);
        Elf32_Rel *re_end = (Elf32_Rel *)(&__rel_dyn_end);
 
-       Elf32_Addr *offset_ptr_rom;
+       Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
        Elf32_Addr *offset_ptr_ram;
 
        /* The size of the region of u-boot that runs out of RAM. */
@@ -72,7 +80,8 @@ 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 *)CONFIG_SYS_TEXT_BASE &&
+                               offset_ptr_rom > last_offset) {
 
                        /* Switch to the in-RAM version */
                        offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
@@ -80,12 +89,23 @@ int do_elf_reloc_fixups(void)
 
                        /* Check that the target points into .text */
                        if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&
-                                       *offset_ptr_ram <
+                                       *offset_ptr_ram <=
                                        (CONFIG_SYS_TEXT_BASE + size)) {
                                *offset_ptr_ram += gd->reloc_off;
+                       } else {
+                               debug("   %p: rom reloc %x, ram %p, value %x,"
+                                       " limit %lx\n", re_src,
+                                       re_src->r_offset, offset_ptr_ram,
+                                       *offset_ptr_ram,
+                                       CONFIG_SYS_TEXT_BASE + size);
                        }
+               } else {
+                       debug("   %p: rom reloc %x, last %p\n", re_src,
+                              re_src->r_offset, last_offset);
                }
-       } while (re_src++ < re_end);
+               last_offset = offset_ptr_rom;
+
+       } while (++re_src < re_end);
 
        return 0;
 }