Migrate generic bootcount to Kconfig

[people/ms/u-boot.git] / common / splash_source.c

diff --git a/common/splash_source.c b/common/splash_source.c
index 8c0ac581f7309f5bbf780970646e28e138e08a3f..e0defdebd6ae7a24cfd5cb345020b047d1465d07 100644 (file)
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -166,7 +166,7 @@ static inline int splash_init_usb(void)
 #ifdef CONFIG_SATA
 static int splash_init_sata(void)
 {
-       return sata_initialize();
+       return sata_probe(0);
 }
 #else
 static inline int splash_init_sata(void)
@@ -317,6 +317,11 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
                return res;
 
        img_header = (struct image_header *)bmp_load_addr;
+       if (image_get_magic(img_header) != FDT_MAGIC) {
+               printf("Could not find FDT magic\n");
+               return -EINVAL;
+       }
+
        fit_size = fdt_totalsize(img_header);
 
        /* Read in entire FIT */