Do not trigger an error when loading a uImage with the IH_TYPE_KERNEL_NOLOAD type. These images do not need to be copied to their load address before being executed. All archs (excepted PPC) do not use the uImage load and entry point parameters, so their current behavior needs not be changed further than just accepting the image type. Tested and validated on ARM.
Unified · Split
| @@ -129,6 +129,8 @@ · 128 unmodified lines | ||
| 129 | 129 | #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ |
| 130 | 130 | #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ |
| 131 | 131 | #define IH_TYPE_KWBIMAGE 9 /* Kirkwood Boot Image */ |
| 132 | +#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run */ | |
| 133 | + /* from any load address */ | |
| 132 | 134 | |
| 133 | 135 | /* |
| 134 | 136 | * Compression Types |
| @@ -39,7 +39,11 @@ int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch) · 38 unmodified lines | ||
| 39 | 39 | return -1; |
| 40 | 40 | } |
| 41 | 41 | #endif |
| 42 | − if (header.ih_type != IH_TYPE_KERNEL) { | |
| 42 | + switch (header.ih_type) { | |
| 43 | + case IH_TYPE_KERNEL: | |
| 44 | + case IH_TYPE_KERNEL_NOLOAD: | |
| 45 | + break; | |
| 46 | + default: | |
| 43 | 47 | printf("uImage type %d unsupported\n", header.ih_type); |
| 44 | 48 | return -1; |
| 45 | 49 | } |