projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disk: convert CONFIG_ISO_PARTITION to Kconfig
[platform/kernel/u-boot.git]
/
include
/
splash.h
diff --git
a/include/splash.h
b/include/splash.h
index
b728bd6
..
228aff4
100644
(file)
--- a/
include/splash.h
+++ b/
include/splash.h
@@
-29,11
+29,13
@@
enum splash_storage {
SPLASH_STORAGE_SF,
SPLASH_STORAGE_MMC,
SPLASH_STORAGE_USB,
SPLASH_STORAGE_SF,
SPLASH_STORAGE_MMC,
SPLASH_STORAGE_USB,
+ SPLASH_STORAGE_SATA,
};
enum splash_flags {
};
enum splash_flags {
- SPLASH_STORAGE_RAW,
- SPLASH_STORAGE_FS,
+ SPLASH_STORAGE_RAW, /* Stored in raw memory */
+ SPLASH_STORAGE_FS, /* Stored within a file system */
+ SPLASH_STORAGE_FIT, /* Stored inside a FIT image */
};
struct splash_location {
};
struct splash_location {
@@
-42,9
+44,20
@@
struct splash_location {
enum splash_flags flags;
u32 offset; /* offset from start of storage */
char *devpart; /* Use the load command dev:part conventions */
enum splash_flags flags;
u32 offset; /* offset from start of storage */
char *devpart; /* Use the load command dev:part conventions */
+ char *mtdpart; /* MTD partition for ubi part */
+ char *ubivol; /* UBI volume-name for ubifsmount */
};
};
+#ifdef CONFIG_SPLASH_SOURCE
int splash_source_load(struct splash_location *locations, uint size);
int splash_source_load(struct splash_location *locations, uint size);
+#else
+static inline int splash_source_load(struct splash_location *locations,
+ uint size)
+{
+ return 0;
+}
+#endif
+
int splash_screen_prepare(void);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
int splash_screen_prepare(void);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN