diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-31 08:18:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-31 08:18:14 -0400 |
| commit | 85769006fce951d0ebf61585ae0ab6b7d880735d (patch) | |
| tree | 12a2b59bf6475489ce9d20ba79b65dc26286b1fa /common/spl/spl.c | |
| parent | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (diff) | |
| parent | 2cc4be280c259ac1e8e74c643c72e0331266056f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kwboot / kwbimage improvements reducing image size (Pali & Marek)
- a37xx: pinctrl: Correct PWM pins definitions (Marek)
- Convert the Dreamplug Ethernet and SATA to Driver Model (Tony)
- serial: a37xx: DEBUG_UART improvements / fixes (Pali)
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index f6375b06a19..d55d3c28485 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -300,6 +300,12 @@ static int spl_load_fit_image(struct spl_image_info *spl_image, } #endif +__weak int spl_parse_board_header(struct spl_image_info *spl_image, + const void *image_header, size_t size) +{ + return -EINVAL; +} + __weak int spl_parse_legacy_header(struct spl_image_info *spl_image, const struct image_header *header) { @@ -352,6 +358,9 @@ int spl_parse_image_header(struct spl_image_info *spl_image, } #endif + if (!spl_parse_board_header(spl_image, (const void *)header, sizeof(*header))) + return 0; + #ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", |