Merge tag 'efi-2019-10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[platform/kernel/u-boot.git] / include / splash.h

diff --git a/include/splash.h b/include/splash.h
index 136eac7..7fd2de8 100644 (file)
--- a/include/splash.h
+++ b/include/splash.h
@@ -33,8 +33,9 @@ enum splash_storage {
 };
 
 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 {
@@ -65,10 +66,10 @@ void splash_get_pos(int *x, int *y);
 static inline void splash_get_pos(int *x, int *y) { }
 #endif
 
-#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
-int lcd_splash(ulong addr);
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
+int splash_display(void);
 #else
-static inline int lcd_splash(ulong addr)
+static inline int splash_display(void)
 {
        return -ENOSYS;
 }