diff options
| author | Masahiro Yamada | 2016-11-26 11:02:10 +0900 |
|---|---|---|
| committer | Simon Glass | 2016-12-02 20:54:34 -0700 |
| commit | 63c0941726e44f31c42de744a57f528fee2df88f (patch) | |
| tree | 30b480501cca603cc6a3ca3b7462d37a011ef671 /include/fdt_support.h | |
| parent | f7f191ee41c0590917f4a969b569af0a01106380 (diff) | |
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 'include/fdt_support.h')
| -rw-r--r-- | include/fdt_support.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h index 506bc5a9f69..955c1217133 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -93,7 +93,15 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size); * property will be left untouched. * @return 0 if ok, or -1 or -FDT_ERR_... on error */ +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks); +#else +static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], + int banks) +{ + return 0; +} +#endif void fdt_fixup_ethernet(void *fdt); int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, |