From 0d9edd2dfb29c2a8c7b7ef5f40bb3a51d6ac0c15 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 31 Jul 2015 09:31:29 -0600 Subject: [PATCH] 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 Reviewed-by: Bin Meng --- 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 eb186b9fb8..cff3abc23a 100644 --- a/arch/x86/include/asm/relocate.h +++ b/arch/x86/include/asm/relocate.h @@ -11,7 +11,6 @@ #include 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 b33586b54c..1a62142a1e 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -17,8 +17,6 @@ #include #include -#include -#include #include #include #include @@ -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.25.1