diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-27 08:24:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-27 08:24:10 -0400 |
| commit | 27af387e4fa7c04d27a92d5d374d81f2a8fa3cce (patch) | |
| tree | 091c1c0638bb2ba4ea93f8e06ea7c3a52557fe73 /arch/arm/lib/zimage.c | |
| parent | 3b589d70cdd0147fb5b5c865a31d63b8f0cd685d (diff) | |
| parent | 67e69660781dac57f4a2347e4ae30d97698f245b (diff) | |
Merge branch '2021-04-27-assorted-fixes'
- An assortment of bug fixes
Diffstat (limited to 'arch/arm/lib/zimage.c')
| -rw-r--r-- | arch/arm/lib/zimage.c | 12 |
1 files changed, 5 insertions, 7 deletions
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; } |