| Message ID | 1556882389.2494.5.camel@googlemail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2] arm: zimage: add barebox image magic number | expand |
On Fri, May 03, 2019 at 01:19:49PM +0200, Christoph Fritz wrote: > For chainboot configurations or test environments, this patch allows > booting barebox images by using command bootz. > > Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c index 09ab331..bc2768b 100644 --- a/arch/arm/lib/zimage.c +++ b/arch/arm/lib/zimage.c @@ -9,6 +9,7 @@ #include <common.h> #define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 +#define BAREBOX_IMAGE_MAGIC 0x00786f62 struct arm_z_header { uint32_t code[9]; @@ -21,9 +22,10 @@ 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) { + if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC && + zi->zi_magic != BAREBOX_IMAGE_MAGICE) { #ifndef CONFIG_SPL_FRAMEWORK - puts("Bad Linux ARM zImage magic!\n"); + puts("zimage: Bad magic!\n"); #endif return 1; }
For chainboot configurations or test environments, this patch allows booting barebox images by using command bootz. Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> --- Changes since v1: - s/other-bootloader/barebox/ arch/arm/lib/zimage.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)