summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author[email protected] <[email protected]>2016-11-16 12:54:39 +0200
committerTom Rini <[email protected]>2016-11-28 15:10:31 -0500
commitf72250e7e7e6c31bc21dc177f1ffe1dc8cc88e3f (patch)
tree93c23491468dfb0f8d5582f95f51a5b5bd7542d6
parent1deeecb6e41a42d0e24fec30d2bb74c56d7a0d9b (diff)
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 <[email protected]> Acked-by: Lokesh Vutla <[email protected]> Reviewed-by: Simon Glass <[email protected]>
-rw-r--r--common/spl/spl_spi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index a3caafbd46d..78b8cd16bb8 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");