From: Samuel Holland <samuel@sholland.org>
Date: Sat, 17 Apr 2021 14:34:37 +0000 (-0500)
Subject: arm: zimage: Use correct symbol to hide messages in SPL
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2e1af1e3e765d53593ee54d1487cd51a7226ee30;p=u-boot.git

arm: zimage: Use correct symbol to hide messages in SPL

When zImage support was added to SPL, the messages were hidden to reduce
code size. However, the wrong config symbol was used. Since this file is
only built when CONFIG_SPL_FRAMEWORK=y, the messages were always hidden.

Use the correct symbol so the messages are printed in U-Boot proper.
Also use IS_ENABLED to drop the #ifdef.

Fixes: 431889d6ad9a ("spl: zImage support in Falcon mode")
Signed-off-by: Samuel Holland <samuel@sholland.org>
---

diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index 477ea94997..45e9c4506a 100644
--- a/arch/arm/lib/zimage.c
+++ b/arch/arm/lib/zimage.c
@@ -25,18 +25,16 @@ int bootz_setup(ulong image, ulong *start, ulong *end)
 
 	if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC &&
 	    zi->zi_magic != BAREBOX_IMAGE_MAGIC) {
-#ifndef CONFIG_SPL_FRAMEWORK
-		puts("zimage: Bad magic!\n");
-#endif
+		if (!IS_ENABLED(CONFIG_SPL_BUILD))
+			puts("zimage: Bad magic!\n");
 		return 1;
 	}
 
 	*start = zi->zi_start;
 	*end = zi->zi_end;
-#ifndef CONFIG_SPL_FRAMEWORK
-	printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
-	       image, *start, *end);
-#endif
+	if (!IS_ENABLED(CONFIG_SPL_BUILD))
+		printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
+		       image, *start, *end);
 
 	return 0;
 }