Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT

[people/ms/u-boot.git] / include / splash.h

diff --git a/include/splash.h b/include/splash.h
index d1fba69325458719c4760a3d07d47f74a6bf0b2d..228aff441b87f46c3747d5376773b559898ebea5 100644 (file)
--- a/include/splash.h
+++ b/include/splash.h
@@ -28,11 +28,14 @@ enum splash_storage {
        SPLASH_STORAGE_NAND,
        SPLASH_STORAGE_SF,
        SPLASH_STORAGE_MMC,
+       SPLASH_STORAGE_USB,
+       SPLASH_STORAGE_SATA,
 };
 
 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 {
@@ -41,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 */
+       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);
+#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