diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
| commit | 73eed452b9c9827474c0789c30729dca6fcf061d (patch) | |
| tree | b33a39a41b7b2891b0171f79ea9b5599658884c3 /common | |
| parent | bfb380b30ad2d678c09037560abb6f09a5e9c9b6 (diff) | |
| parent | a2558e8729831e0bcef634ea2440e60425ef0ff6 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 2 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 0609470dfb..c9f7019e38 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) { diff --git a/common/image-fdt.c b/common/image-fdt.c index 5454227fc9..e7540be8d6 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -474,12 +474,10 @@ 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) { diff --git a/common/spl/spl.c b/common/spl/spl.c index 32b9f1e95c..9bcbd09ff3 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -513,6 +513,9 @@ ulong spl_relocate_stack_gd(void) ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16); new_gd = (gd_t *)ptr; memcpy(new_gd, (void *)gd, sizeof(gd_t)); +#if CONFIG_IS_ENABLED(DM) + dm_fixup_for_gd_move(new_gd); +#endif #if !defined(CONFIG_ARM) gd = new_gd; #endif |