diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-10 07:07:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-10 07:07:49 -0400 |
| commit | 927a37df9f5ed33fc350b9cc509d9f50ffaf5cd2 (patch) | |
| tree | 0afab773bb17cb8f33ab6e2e2b969423ec36140b /arch/arm/lib | |
| parent | f30f268a07b0c9e4418366debc9ad0100a47cea4 (diff) | |
| parent | 0d7b6cffa532eecfdc7cb87c2c65cd311344981f (diff) | |
Merge branch '2019-05-09-master-imports'
- Minor fixes (ata memory leak, implement feedback on ohci-da8xx
changes, avb test fix, mmc test fix, spelling fixes, make FIT really
optional, fit-dtb blob cleanups, TI K3 workflow improvements, bootz
can boot barebox on 32bit ARM).
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/zimage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c index 09ab331ee09..49305299b39 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_MAGIC) { #ifndef CONFIG_SPL_FRAMEWORK - puts("Bad Linux ARM zImage magic!\n"); + puts("zimage: Bad magic!\n"); #endif return 1; } |