common: convert compulab splash load code to common code

Move board/compulab/common/splash.c code to
common/splash_source.c to make it available for everybody. This move
renames cl_splash_screen_prepare() to splash_source_load(), and
the compilation of this code is conditional on CONFIG_SPLASH_SOURCE.

splash_source features:
* Provide a standardized way for declaring board specific splash screen
  locations
* Provide existing routines for auto loading the splash image from the
  locations as declared by the board
* Introduce the "splashsource" environment variable, which makes it
  possible to select the splash image source.

cm-t35 and cm-fx6 are updated to use the modified version.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Tom Rini <trini@ti.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b5c3ea19d362dc2280b88910f9b6209e9392ae2a..ae6945ba9c9ca2b7f5f86f7f61bee3f310634eb0 100644 (file)
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -15,6 +15,7 @@
 #include <netdev.h>
 #include <fdt_support.h>
 #include <sata.h>
+#include <splash.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
@@ -42,8 +43,8 @@ static struct splash_location cm_fx6_splash_locations[] = {
 
 int splash_screen_prepare(void)
 {
-       return cl_splash_screen_prepare(cm_fx6_splash_locations,
-                                       ARRAY_SIZE(cm_fx6_splash_locations));
+       return splash_source_load(cm_fx6_splash_locations,
+                                 ARRAY_SIZE(cm_fx6_splash_locations));
 }
 #endif
 

diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index 8143c05353cc615a2802e33619b555ea314cfd34..c4ea8ea875f533f21a4d0bec13bf8795026658b9 100644 (file)
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <usb.h>
 #include <mmc.h>
+#include <splash.h>
 #include <twl4030.h>
 #include <linux/compiler.h>
 
@@ -69,8 +70,8 @@ struct splash_location splash_locations[] = {
 
 int splash_screen_prepare(void)
 {
-       return cl_splash_screen_prepare(splash_locations,
-                                       ARRAY_SIZE(splash_locations));
+       return splash_source_load(splash_locations,
+                                 ARRAY_SIZE(splash_locations));
 }
 
 /*

diff --git a/board/compulab/common/Makefile b/board/compulab/common/Makefile
index dbf0009652a69263b48a15e19c8dc338f3068102..286f32731da28e0f81ff811600f8ee6da215b67e 100644 (file)
--- a/board/compulab/common/Makefile
+++ b/board/compulab/common/Makefile
@@ -9,5 +9,4 @@
 obj-y                          += common.o
 obj-$(CONFIG_SYS_I2C)          += eeprom.o
 obj-$(CONFIG_LCD)              += omap3_display.o
-obj-$(CONFIG_SPLASH_SCREEN)    += splash.o
 obj-$(CONFIG_SMC911X)          += omap3_smc911x.o

diff --git a/board/compulab/common/common.h b/board/compulab/common/common.h
index b992965457d82fe09e5cc8042ca1363d2c1a2426..8f38b79fb0543042f2f8599df22fd3d26cc2d65b 100644 (file)
--- a/board/compulab/common/common.h
+++ b/board/compulab/common/common.h
@@ -24,27 +24,6 @@ static inline int cl_usb_hub_init(int gpio, const char *label)
 static inline void cl_usb_hub_deinit(int gpio) {}
 #endif /* CONFIG_CMD_USB */
 
-enum splash_storage {
-       SPLASH_STORAGE_NAND,
-       SPLASH_STORAGE_SF,
-};
-
-struct splash_location {
-       char *name;
-       enum splash_storage storage;
-       u32 offset;     /* offset from start of storage */
-};
-
-#ifdef CONFIG_SPLASH_SCREEN
-int cl_splash_screen_prepare(struct splash_location *locations, uint size);
-#else /* !CONFIG_SPLASH_SCREEN */
-static inline int cl_splash_screen_prepare(struct splash_location *locations,
-                                          uint size)
-{
-       return -ENOSYS;
-}
-#endif /* CONFIG_SPLASH_SCREEN */
-
 #ifdef CONFIG_SMC911X
 int cl_omap3_smc911x_init(int id, int cs, u32 base_addr,
                          int (*reset)(int), int rst_gpio);

diff --git a/common/Makefile b/common/Makefile
index 94554f2939e5361179842fef3777d7ee6c06165d..0f1416d1e8a3d01cdf9632d9bdb4b8b0f5e724e2 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -196,6 +196,7 @@ obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o
 obj-$(CONFIG_I2C_EDID) += edid.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-y += splash.o
+obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o
 obj-$(CONFIG_LCD) += lcd.o lcd_console.o
 obj-$(CONFIG_LYNXKDI) += lynxkdi.o
 obj-$(CONFIG_MENU) += menu.o

diff --git a/board/compulab/common/splash.c b/common/splash_source.c
similarity index 87%
rename from board/compulab/common/splash.c
rename to common/splash_source.c
index 16c315ca5a51f6e66fcd5a5e54641f00b008b135..d1bb5a4baf3b3dbe247c790e9bdf2424fc606d15 100644 (file)
--- a/board/compulab/common/splash.c
+++ b/common/splash_source.c
@@ -9,10 +9,10 @@
 #include <common.h>
 #include <nand.h>
 #include <errno.h>
+#include <splash.h>
 #include <spi_flash.h>
 #include <spi.h>
 #include <bmp_layout.h>
-#include "common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -98,8 +98,7 @@ static int splash_load_raw(struct splash_location *location, u32 bmp_load_addr)
        return splash_storage_read(location, bmp_load_addr, bmp_size);
 
 splash_address_too_high:
-       printf("Error: splashimage address too high. Data overwrites U-Boot "
-               "and/or placed beyond DRAM boundaries.\n");
+       printf("Error: splashimage address too high. Data overwrites U-Boot and/or placed beyond DRAM boundaries.\n");
 
        return -EFAULT;
 }
@@ -141,7 +140,19 @@ static struct splash_location *select_splash_location(
        return NULL;
 }
 
-int cl_splash_screen_prepare(struct splash_location *locations, uint size)
+/**
+ * splash_source_load - load splash image from a supported location.
+ *
+ * Select a splash image location based on the value of splashsource environment
+ * variable and the board supported splash source locations, and load a
+ * splashimage to the address pointed to by splashimage environment variable.
+ *
+ * @locations:         An array of supported splash locations.
+ * @size:              Size of splash_locations array.
+ *
+ * @return: 0 on success, negative value on failure.
+ */
+int splash_source_load(struct splash_location *locations, uint size)
 {
        struct splash_location *splash_location;
        char *env_splashimage_value;

diff --git a/doc/README.splashprepare b/doc/README.splashprepare
index 61b4ec53ecaddee676e0c6c2ec1dac65efe544d4..a0f0f3ca51f794630f3f398f40dae0c567c1ad1a 100644 (file)
--- a/doc/README.splashprepare
+++ b/doc/README.splashprepare
@@ -6,3 +6,16 @@ common/splash.c. It is called as part of the splash screen display
 sequence. It gives the board an opportunity to prepare the splash
 image data before it is processed and sent to the frame buffer by
 U-Boot.  Define your own version to use this feature.
+
+CONFIG_SPLASH_SOURCE
+
+Use the splash_source.c library. This library provides facilities to declare
+board specific splash image locations, routines for loading splash image from
+supported locations, and a way of controlling the selected splash location
+using the "splashsource" environment variable.
+
+splashsource works as follows:
+- If splashsource is set to a supported location name as defined by board code,
+  use that splash location.
+- If splashsource is undefined, use the first splash location as default.
+- If splashsource is set to an unsupported value, do not load a splash screen.

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index b92ba976e91999ebed586bc3c5d6d332fea9dd6d..1f6449505511c1f6001a8d5bbe846e8d827145cc 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -313,6 +313,7 @@
 #define CONFIG_VIDEO_SW_CURSOR
 
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SOURCE
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_BMP_RLE8
 

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 9767512a5cf03771a5008932433b417cdacfbe56..b2a9f35797093a7698b6e4db9464849962d51dbe 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -310,6 +310,7 @@
 
 #define CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SOURCE
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP
 #define CONFIG_SCF0403_LCD

diff --git a/include/splash.h b/include/splash.h
index 89ee7b22ec2b324f4c29f37018242a91a42259a7..a60e89542343532b2356d86f0215f30d53e228c6 100644 (file)
--- a/include/splash.h
+++ b/include/splash.h
@@ -22,7 +22,18 @@
 #ifndef _SPLASH_H_
 #define _SPLASH_H_
 
+enum splash_storage {
+       SPLASH_STORAGE_NAND,
+       SPLASH_STORAGE_SF,
+};
 
+struct splash_location {
+       char *name;
+       enum splash_storage storage;
+       u32 offset;     /* offset from start of storage */
+};
+
+int splash_source_load(struct splash_location *locations, uint size);
 int splash_screen_prepare(void);
 
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN