Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: riscv: Remove additional ifdef from code guarded by CONFIG_IS_ENABLED

Browse source 
CONFIG_OF_LIBFDT is used twice for guarding the same code. It is enough to
do it once that's why remove additional ifdefs from arm and risc-v code.

Fixes: 0c303f9a66 ("image: Drop IMAGE_ENABLE_OF_LIBFDT")
Signed-off-by: Michal Simek <michal.simek@amd.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Link: https://lore.kernel.org/r/f8e3ff9124195cbd957874de9a65ef79760ef5e7.1657183634.git.michal.simek@amd.com
This commit is contained in:
Michal Simek 2022-07-07 10:47:16 +02:00
parent e3521e9c69
commit b09e462482
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/lib/bootm.c
View file

@ -200,12 +200,10 @@ static void boot_prep_linux(bootm_headers_t *images)
char *commandline = env_get("bootargs"); char *commandline = env_get("bootargs");
if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) { if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
#ifdef CONFIG_OF_LIBFDT
debug("using: FDT\n"); debug("using: FDT\n");
if (image_setup_linux(images)) { if (image_setup_linux(images)) {
panic("FDT creation failed!"); panic("FDT creation failed!");
} }
#endif
} else if (BOOTM_ENABLE_TAGS) { } else if (BOOTM_ENABLE_TAGS) {
debug("using: ATAGS\n"); debug("using: ATAGS\n");
setup_start_tag(gd->bd); setup_start_tag(gd->bd);

2
arch/riscv/lib/bootm.c
View file

@ -65,13 +65,11 @@ static void announce_and_cleanup(int fake)
static void boot_prep_linux(bootm_headers_t *images) static void boot_prep_linux(bootm_headers_t *images)
{ {
if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) { if (CONFIG_IS_ENABLED(OF_LIBFDT) && images->ft_len) {
#ifdef CONFIG_OF_LIBFDT
debug("using: FDT\n"); debug("using: FDT\n");
if (image_setup_linux(images)) { if (image_setup_linux(images)) {
printf("FDT creation failed! hanging..."); printf("FDT creation failed! hanging...");
hang(); hang();
} }
#endif
} else { } else {
printf("Device tree not found or missing FDT support\n"); printf("Device tree not found or missing FDT support\n");
hang(); hang();