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 /common/fdt_support.c | |
| 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 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 0609470..c9f7019 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -381,6 +381,7 @@ void do_fixup_by_compat_u32(void *fdt, const char *compat, do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create); } +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY /* * fdt_pack_reg - pack address and size array into the "reg"-suitable stream */ @@ -459,6 +460,7 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) } return 0; } +#endif int fdt_fixup_memory(void *blob, u64 start, u64 size) { |