diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
| commit | 53e0fef5a74ac10618da083a01bbf97b4387a3dd (patch) | |
| tree | 2e3d22c903796c967a4855a27f996b7705603c74 /common/image-fdt.c | |
| parent | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (diff) | |
| parent | 2f7aa89703738b0c37e34120319bab567a8672bd (diff) | |
Merge branch '2021-02-24-assorted-fixes'
- squashfs, btrfs fixes
- Kconfig CONFIG logic fixes
- hikey DM migration
- Some portability fixes for the build system
- Assorted code cleanups
Diffstat (limited to 'common/image-fdt.c')
| -rw-r--r-- | common/image-fdt.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 61ce6e5779f..a287b663925 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -576,11 +576,18 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, fdt_fixup_pstore(blob); #endif if (IMAGE_OF_BOARD_SETUP) { - fdt_ret = ft_board_setup(blob, gd->bd); - if (fdt_ret) { - printf("ERROR: board-specific fdt fixup failed: %s\n", - fdt_strerror(fdt_ret)); - goto err; + const char *skip_board_fixup; + + skip_board_fixup = env_get("skip_board_fixup"); + if (skip_board_fixup && ((int)simple_strtol(skip_board_fixup, NULL, 10) == 1)) { + printf("skip board fdt fixup\n"); + } else { + fdt_ret = ft_board_setup(blob, gd->bd); + if (fdt_ret) { + printf("ERROR: board-specific fdt fixup failed: %s\n", + fdt_strerror(fdt_ret)); + goto err; + } } } if (IMAGE_OF_SYSTEM_SETUP) { |