diff options
| author | Pali Rohár <pali@kernel.org> | 2022-01-14 14:31:38 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2022-01-20 11:35:29 +0100 |
| commit | 2e0429bcc1a9cf2c3b4cc0e8af7199f031a3b8e9 (patch) | |
| tree | acf9804cf808bcacfec4984a8fbf63898fae28fe /common/spl/spl_spi.c | |
| parent | 66f874855cc6e750e979a9e08bb96d0da38d534f (diff) | |
| download | u-boot-2e0429bcc1a9cf2c3b4cc0e8af7199f031a3b8e9.zip u-boot-2e0429bcc1a9cf2c3b4cc0e8af7199f031a3b8e9.tar.gz u-boot-2e0429bcc1a9cf2c3b4cc0e8af7199f031a3b8e9.tar.bz2 | |
SPL: Add struct spl_boot_device parameter into spl_parse_board_header()
Add parameter spl_boot_device to spl_parse_board_header(), which allows
the implementations to see from which device we are booting and do
boot-device-specific checks of the image header.
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/spl/spl_spi.c')
| -rw-r--r-- | common/spl/spl_spi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 4e20a23..cf3f7ef 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -24,6 +24,7 @@ * the kernel and then device tree. */ static int spi_load_image_os(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, struct spi_flash *flash, struct image_header *header) { @@ -36,7 +37,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image, if (image_get_magic(header) != IH_MAGIC) return -1; - err = spl_parse_image_header(spl_image, header); + err = spl_parse_image_header(spl_image, bootdev, header); if (err) return err; @@ -108,7 +109,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, } #if CONFIG_IS_ENABLED(OS_BOOT) - if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) + if (spl_start_uboot() || spi_load_image_os(spl_image, bootdev, flash, header)) #endif { /* Load u-boot, mkimage header is 64 bytes. */ @@ -127,7 +128,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, (void *)CONFIG_SYS_LOAD_ADDR); if (err) return err; - err = spl_parse_image_header(spl_image, + err = spl_parse_image_header(spl_image, bootdev, (struct image_header *)CONFIG_SYS_LOAD_ADDR); } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && image_get_magic(header) == FDT_MAGIC) { @@ -154,7 +155,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, err = spl_load_imx_container(spl_image, &load, payload_offs); } else { - err = spl_parse_image_header(spl_image, header); + err = spl_parse_image_header(spl_image, bootdev, header); if (err) return err; err = spi_flash_read(flash, payload_offs + spl_image->offset, |