summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-07-31 09:31:29 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 08:42:40 -0600
commit0d9edd2dfb29c2a8c7b7ef5f40bb3a51d6ac0c15 (patch)
treeb8cf75c4dd8f83c4f40e64faf148f4df6a81d406
parent83ec7de3bc17dda42d681d3a015191a23c6f1f73 (diff)
downloadu-boot-imx-0d9edd2dfb29c2a8c7b7ef5f40bb3a51d6ac0c15.zip
u-boot-imx-0d9edd2dfb29c2a8c7b7ef5f40bb3a51d6ac0c15.tar.gz
u-boot-imx-0d9edd2dfb29c2a8c7b7ef5f40bb3a51d6ac0c15.tar.bz2
x86: Drop unused copy_fdt_to_ram()
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@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--arch/x86/include/asm/relocate.h1
-rw-r--r--arch/x86/lib/relocate.c18
2 files changed, 0 insertions, 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;