[U-Boot] [PATCH 11/48] x86: Drop unused copy_fdt_to_ram()

Simon Glass sjg at chromium.org
Wed Jul 22 17:49:03 CEST 2015


This is now handled by generic U-Boot code so we do not need an x86 version.
It is no-longer called, so remove it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/x86/include/asm/relocate.h |  1 -
 arch/x86/lib/relocate.c         | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/arch/x86/include/asm/relocate.h b/arch/x86/include/asm/relocate.h
index eb186b9..cff3abc 100644
--- a/arch/x86/include/asm/relocate.h
+++ b/arch/x86/include/asm/relocate.h
@@ -11,7 +11,6 @@
 #include <common.h>
 
 int copy_uboot_to_ram(void);
-int copy_fdt_to_ram(void);
 int clear_bss(void);
 int do_elf_reloc_fixups(void);
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index b33586b..1a62142 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -17,8 +17,6 @@
 
 #include <common.h>
 #include <inttypes.h>
-#include <libfdt.h>
-#include <malloc.h>
 #include <asm/u-boot-x86.h>
 #include <asm/relocate.h>
 #include <asm/sections.h>
@@ -35,22 +33,6 @@ 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;
-- 
2.4.3.573.g4eafbef



More information about the U-Boot mailing list