diff options
| author | Tom Rini <[email protected]> | 2024-11-26 10:49:44 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-11-26 10:49:44 -0600 |
| commit | ff7bf50b30eb2749023620616d53a28c2b6246ff (patch) | |
| tree | 178241108efef072c015026d56534426505baa1d /tools | |
| parent | 48380f9b2a12e3fc6339d6af5a154bded769d911 (diff) | |
| parent | a488d9f26e37bcb5776bc8a2dadb708f1ac9cfdc (diff) | |
Merge tag 'u-boot-imx-next-20241126' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/23563
- Make Siemens i.MX8 Capricorn board to boot U-Boot mainline again.
- Add support for phycore-imx93 2GB LPDDR4X variant.
- Add phycore-imx8mm EEPROM detection initialisation.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/imx8image.c | 2 | ||||
| -rwxr-xr-x | tools/imx_cntr_image.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/imx8image.c b/tools/imx8image.c index 7a060811c7e..15510d3e712 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -734,7 +734,7 @@ static int get_container_image_start_pos(image_t *image_stack, uint32_t align) fclose(fd); if (header.tag != IVT_HEADER_TAG_B0) { - fprintf(stderr, "header tag mismatched \n"); + fprintf(stderr, "header tag mismatched file %s\n", img_sp->filename); exit(EXIT_FAILURE); } else { file_off += diff --git a/tools/imx_cntr_image.sh b/tools/imx_cntr_image.sh index 972b95ccbee..07acd385631 100755 --- a/tools/imx_cntr_image.sh +++ b/tools/imx_cntr_image.sh @@ -14,6 +14,10 @@ for f in $blobs; do continue fi + if [ $f = "spl/u-boot-spl.bin" ]; then + continue + fi + if [ -f $f ]; then continue fi |