diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
| commit | 89a650e0ffb89faaea1b9e6ad8cf2b38203435f2 (patch) | |
| tree | 4827f512e3c1e6f2887133bbb9cb3ee9497ba603 /tools | |
| parent | 423effc04a195ce6a464eadadfa7f765bf786889 (diff) | |
| parent | 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b (diff) | |
Merge tag 'xilinx-for-v2018.05' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.05
- Fix mkimage recognition
- Update all my fragments
ZynqMP:
- Use clk driver
- Support loading elfs in el1
- Various DTS and defconfig changes
- Enable newer pmufw versions
- Support more clocks
- Remove ep108
- Secure image support
- Fix memtest setup
Zynq:
- Enabling watchdog driver
- Support more clocks
- defconfig changes
fpga:
- Simplify error path
net:
- GMII case update
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/zynqimage.c | 6 | ||||
| -rw-r--r-- | tools/zynqmpimage.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/zynqimage.c b/tools/zynqimage.c index 021d2d3fc9..aa003a7543 100644 --- a/tools/zynqimage.c +++ b/tools/zynqimage.c @@ -147,6 +147,12 @@ static int zynqimage_verify_header(unsigned char *ptr, int image_size, if (image_size < sizeof(struct zynq_header)) return -1; + if (zynqhdr->__reserved1 != 0) + return -1; + + if (zynqhdr->__reserved2 != 0) + return -1; + if (zynqhdr->width_detection != HEADER_WIDTHDETECTION) return -1; if (zynqhdr->image_identifier != HEADER_IMAGEIDENTIFIER) diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index f48ac6dbe5..a61fb17c40 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -178,7 +178,7 @@ static void zynqmpimage_print_header(const void *ptr) struct zynqmp_header *zynqhdr = (struct zynqmp_header *)ptr; int i; - printf("Image Type : Xilinx Zynq Boot Image support\n"); + printf("Image Type : Xilinx ZynqMP Boot Image support\n"); printf("Image Offset : 0x%08x\n", le32_to_cpu(zynqhdr->image_offset)); printf("Image Size : %lu bytes (%lu bytes packed)\n", (unsigned long)le32_to_cpu(zynqhdr->image_size), |