[U-Boot] [PATCH 11/11] ARM: bootm: drop redundant #ifdef conditional

Masahiro Yamada yamada.masahiro at socionext.com
Fri Dec 18 03:05:10 CET 2015


This if-block is compiled only when IS_ENABLED(CONFIG_OF_LIBFDT) is
true.  The #ifdef CONFIG_OF_LIBFDT inside of it is redundant.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 arch/arm/lib/bootm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index d036d3e..7e729f7 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -206,13 +206,11 @@ static void boot_prep_linux(bootm_headers_t *images)
 	char *commandline = getenv("bootargs");
 
 	if (IS_ENABLED(CONFIG_OF_LIBFDT) && images->ft_len) {
-#ifdef CONFIG_OF_LIBFDT
 		debug("using: FDT\n");
 		if (image_setup_linux(images)) {
 			printf("FDT creation failed! hanging...");
 			hang();
 		}
-#endif
 	} else if (BOOTM_ENABLE_TAGS) {
 		debug("using: ATAGS\n");
 		setup_start_tag(gd->bd);
-- 
1.9.1



More information about the U-Boot mailing list