arm: zimage: add barebox image magic number

[oweals/u-boot.git] / arch / arm / lib / zimage.c

diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
index 09ab331ee09c31d47c502f46791b0cd4bfd5915e..49305299b39a9f473b8578c4b5957cf285711703 100644 (file)
--- 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_MAGIC) {
 #ifndef CONFIG_SPL_FRAMEWORK
-               puts("Bad Linux ARM zImage magic!\n");
+               puts("zimage: Bad magic!\n");
 #endif
                return 1;
        }