From 63c0941726e44f31c42de744a57f528fee2df88f Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 26 Nov 2016 11:02:10 +0900 Subject: libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORY Commit e2f88dfd2d96 ("libfdt: Introduce new ARCH_FIXUP_FDT option") allows us to skip memory setup of DTB, but a problem for ARM is that spin_table_update_dt() and psci_update_dt() are skipped as well if CONFIG_ARCH_FIXUP_FDT is disabled. This commit allows us to skip only fdt_fixup_memory_banks() instead of the whole of arch_fixup_fdt(). It will be useful when we want to use a memory node from a kernel DTB as is, but need some fixups for Spin-Table/PSCI. Signed-off-by: Masahiro Yamada Acked-by: Alexey Brodkin Acked-by: Simon Glass Fixed build error for x86: Signed-off-by: Simon Glass --- arch/mips/lib/bootm.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/mips/lib/bootm.c') diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 9fec4ad438..be877625a8 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -253,7 +253,6 @@ static int boot_reloc_fdt(bootm_headers_t *images) #endif } -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { #if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT) @@ -265,7 +264,6 @@ int arch_fixup_fdt(void *blob) return 0; #endif } -#endif static int boot_setup_fdt(bootm_headers_t *images) { -- cgit v1.2.1