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>
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;
}