projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nyan-big: add padding to its file
[oweals/u-boot.git]
/
common
/
splash_source.c
diff --git
a/common/splash_source.c
b/common/splash_source.c
index 8c0ac581f7309f5bbf780970646e28e138e08a3f..62763b9ebd5698b454280a6d4b62cd23a7312786 100644
(file)
--- a/
common/splash_source.c
+++ b/
common/splash_source.c
@@
-1,9
+1,8
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il>
*
* Authors: Igor Grinberg <grinberg@compulab.co.il>
/*
* (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il>
*
* Authors: Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-166,7
+165,7
@@
static inline int splash_init_usb(void)
#ifdef CONFIG_SATA
static int splash_init_sata(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)
}
#else
static inline int splash_init_sata(void)
@@
-317,6
+316,11
@@
static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
return res;
img_header = (struct image_header *)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 */
fit_size = fdt_totalsize(img_header);
/* Read in entire FIT */