diff options
| author | Simon Glass <sjg@chromium.org> | 2023-11-18 14:05:08 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-13 11:51:24 -0500 |
| commit | 972d524893e4635ff1ac4286a870cda2dd3fc301 (patch) | |
| tree | 96f62f4236b09101c44cfd2a8b62fa4cec24ba3f | |
| parent | 813f75d8580c96fe83f3b7a450a981e982429356 (diff) | |
bootm: Drop #ifdef in bootm_find_images()
The OF_LIBFDT #ifdef makes it harder to use a local variable for that
code block. Convert it to if() instead.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | boot/bootm.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index d5893e82d12..d9c62d730f7 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -524,29 +524,29 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, return 1; } -#if CONFIG_IS_ENABLED(OF_LIBFDT) - /* find flattened device tree */ - ret = boot_get_fdt(flag, argc, argv, IH_ARCH_DEFAULT, &images, - &images.ft_addr, &images.ft_len); - if (ret) { - puts("Could not find a valid device tree\n"); - return 1; - } + if (CONFIG_IS_ENABLED(OF_LIBFDT)) { + /* find flattened device tree */ + ret = boot_get_fdt(flag, argc, argv, IH_ARCH_DEFAULT, &images, + &images.ft_addr, &images.ft_len); + if (ret) { + puts("Could not find a valid device tree\n"); + return 1; + } - /* check if FDT overlaps OS image */ - if (images.ft_addr && - (((ulong)images.ft_addr >= start && - (ulong)images.ft_addr < start + size) || - ((ulong)images.ft_addr + images.ft_len >= start && - (ulong)images.ft_addr + images.ft_len < start + size))) { - printf("ERROR: FDT image overlaps OS image (OS=0x%lx..0x%lx)\n", - start, start + size); - return 1; - } + /* check if FDT overlaps OS image */ + if (images.ft_addr && + (((ulong)images.ft_addr >= start && + (ulong)images.ft_addr < start + size) || + ((ulong)images.ft_addr + images.ft_len >= start && + (ulong)images.ft_addr + images.ft_len < start + size))) { + printf("ERROR: FDT image overlaps OS image (OS=0x%lx..0x%lx)\n", + start, start + size); + return 1; + } - if (IS_ENABLED(CONFIG_CMD_FDT)) - set_working_fdt_addr(map_to_sysmem(images.ft_addr)); -#endif + if (IS_ENABLED(CONFIG_CMD_FDT)) + set_working_fdt_addr(map_to_sysmem(images.ft_addr)); + } #if CONFIG_IS_ENABLED(FIT) if (IS_ENABLED(CONFIG_FPGA)) { |