diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-26 11:02:10 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-12-02 20:54:34 -0700 |
| commit | 63c0941726e44f31c42de744a57f528fee2df88f (patch) | |
| tree | 30b480501cca603cc6a3ca3b7462d37a011ef671 /arch/mips | |
| parent | f7f191ee41c0590917f4a969b569af0a01106380 (diff) | |
| download | u-boot-imx-63c0941726e44f31c42de744a57f528fee2df88f.zip u-boot-imx-63c0941726e44f31c42de744a57f528fee2df88f.tar.gz u-boot-imx-63c0941726e44f31c42de744a57f528fee2df88f.tar.bz2 | |
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 <yamada.masahiro@socionext.com>
Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
Acked-by: Simon Glass <sjg@chromium.org>
Fixed build error for x86:
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/lib/bootm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 9fec4ad..be87762 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) { |