mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-24 20:13:39 +00:00
c2343695e3
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: 431889d6ad ("spl: zImage support in Falcon mode")
Signed-off-by: Samuel Holland <samuel@sholland.org>
40 lines
910 B
C
40 lines
910 B
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2016
|
|
* Ladislav Michl <ladis@linux-mips.org>
|
|
*
|
|
* bootz code:
|
|
* Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com>
|
|
*/
|
|
#include <common.h>
|
|
#include <image.h>
|
|
|
|
#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818
|
|
#define BAREBOX_IMAGE_MAGIC 0x00786f62
|
|
|
|
struct arm_z_header {
|
|
uint32_t code[9];
|
|
uint32_t zi_magic;
|
|
uint32_t zi_start;
|
|
uint32_t zi_end;
|
|
} __attribute__ ((__packed__));
|
|
|
|
int bootz_setup(ulong image, ulong *start, ulong *end)
|
|
{
|
|
struct arm_z_header *zi = (struct arm_z_header *)image;
|
|
|
|
if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC &&
|
|
zi->zi_magic != BAREBOX_IMAGE_MAGIC) {
|
|
if (!IS_ENABLED(CONFIG_SPL_BUILD))
|
|
puts("zimage: Bad magic!\n");
|
|
return 1;
|
|
}
|
|
|
|
*start = zi->zi_start;
|
|
*end = zi->zi_end;
|
|
if (!IS_ENABLED(CONFIG_SPL_BUILD))
|
|
printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
|
|
image, *start, *end);
|
|
|
|
return 0;
|
|
}
|