diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-07-28 09:06:41 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-31 19:37:08 -0600 |
| commit | e2f88dfd2d9671945877daf5a8c9223b864c34d1 (patch) | |
| tree | 6d2e31420dea6edd8a46bf7d24f8514e1c574c50 /common/image-fdt.c | |
| parent | 26fb8db0f4d1e7c118b5e8f3a8849f359b91c166 (diff) | |
libfdt: Introduce new ARCH_FIXUP_FDT option
Add new Kconfig option to disable arch_fixup_fdt() calls for cases where
U-Boot shouldn't update memory setup in DTB file.
One example of usage of this option is to boot OS with different memory
setup than U-Boot use.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/image-fdt.c')
| -rw-r--r-- | common/image-fdt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 6cac7dbb7f..d6ee225d40 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -458,11 +458,6 @@ __weak int ft_verify_fdt(void *fdt) return 1; } -__weak int arch_fixup_fdt(void *blob) -{ - return 0; -} - int image_setup_libfdt(bootm_headers_t *images, void *blob, int of_size, struct lmb *lmb) { @@ -479,10 +474,12 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: /chosen node create failed\n"); goto err; } +#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(blob) < 0) { printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } +#endif if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { |