X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fx86%2Flib%2Frelocate.c;h=0d683bfc12282ee5ca1243fde252da6771c0f165;hb=a5221b52064013137109e7aa659b661747f47e98;hp=526daaf93a639194e693ef8fd5f5d6486f256721;hpb=1a4596601fd395f3afb8f82f3f840c5e00bdd57a;p=u-boot

diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 526daaf93a..0d683bfc12 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -16,8 +16,7 @@
  */
 
 #include <common.h>
-#include <libfdt.h>
-#include <malloc.h>
+#include <inttypes.h>
 #include <asm/u-boot-x86.h>
 #include <asm/relocate.h>
 #include <asm/sections.h>
@@ -29,32 +28,20 @@ int copy_uboot_to_ram(void)
 {
 	size_t len = (size_t)&__data_end - (size_t)&__text_start;
 
+	if (gd->flags & GD_FLG_SKIP_RELOC)
+		return 0;
 	memcpy((void *)gd->relocaddr, (void *)&__text_start, len);
 
 	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;
 	size_t len = (size_t)&__bss_end - (size_t)&__bss_start;
 
+	if (gd->flags & GD_FLG_SKIP_RELOC)
+		return 0;
 	memset((void *)dst_addr, 0x00, len);
 
 	return 0;
@@ -71,33 +58,43 @@ int do_elf_reloc_fixups(void)
 
 	Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
 	Elf32_Addr *offset_ptr_ram;
+	unsigned int text_base = 0;
 
 	/* The size of the region of u-boot that runs out of RAM. */
 	uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
 
+	if (gd->flags & GD_FLG_SKIP_RELOC)
+		return 0;
+	if (re_src == re_end)
+		panic("No relocation data");
+
+#ifdef CONFIG_SYS_TEXT_BASE
+	text_base = CONFIG_SYS_TEXT_BASE;
+#else
+	panic("No CONFIG_SYS_TEXT_BASE");
+#endif
 	do {
 		/* Get the location from the relocation entry */
 		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 &&
-				offset_ptr_rom > last_offset) {
+		if (offset_ptr_rom >= (Elf32_Addr *)text_base &&
+		    offset_ptr_rom > last_offset) {
 
 			/* Switch to the in-RAM version */
 			offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
 							gd->reloc_off);
 
 			/* Check that the target points into .text */
-			if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&
-					*offset_ptr_ram <=
-					(CONFIG_SYS_TEXT_BASE + size)) {
+			if (*offset_ptr_ram >= text_base &&
+			    *offset_ptr_ram <= text_base + size) {
 				*offset_ptr_ram += gd->reloc_off;
 			} else {
 				debug("   %p: rom reloc %x, ram %p, value %x,"
-					" limit %lx\n", re_src,
+					" limit %" PRIXPTR "\n", re_src,
 					re_src->r_offset, offset_ptr_ram,
 					*offset_ptr_ram,
-					CONFIG_SYS_TEXT_BASE + size);
+					text_base + size);
 			}
 		} else {
 			debug("   %p: rom reloc %x, last %p\n", re_src,