diff options
| author | tomas.melin@vaisala.com <tomas.melin@vaisala.com> | 2016-11-16 12:54:39 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-28 15:10:31 -0500 |
| commit | f72250e7e7e6c31bc21dc177f1ffe1dc8cc88e3f (patch) | |
| tree | 93c23491468dfb0f8d5582f95f51a5b5bd7542d6 /common | |
| parent | 1deeecb6e41a42d0e24fec30d2bb74c56d7a0d9b (diff) | |
| download | u-boot-f72250e7e7e6c31bc21dc177f1ffe1dc8cc88e3f.tar.gz | |
spl: add check for FIT-header when loading image
Add check for FDT_MAGIC, otherwise also legacy images will be loaded as
a FIT. With this check in place, the loader works correct both
with legacy and FIT images.
Signed-off-by: Tomas Melin <tomas.melin@vaisala.com>
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index a3caafbd46..78b8cd16bb 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -99,7 +99,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, if (err) return err; - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) { + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { struct spl_load_info load; debug("Found FIT\n"); |