summaryrefslogtreecommitdiffstats
path: root/board/compulab/cm_fx6/cm_fx6.c
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2015-01-14 10:42:54 +0200
committerStefano Babic <sbabic@denx.de>2015-01-29 17:44:08 +0100
commitf82eb2fa5df86b7180ea355a3cb98482f7c27269 (patch)
tree425824791eb9a187467cc25f9c720fb33ee5a3e1 /board/compulab/cm_fx6/cm_fx6.c
parent3a236a356397449bf3ad1e72221053b5a3d87b80 (diff)
downloadblackbird-obmc-uboot-f82eb2fa5df86b7180ea355a3cb98482f7c27269.tar.gz
blackbird-obmc-uboot-f82eb2fa5df86b7180ea355a3cb98482f7c27269.zip
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>
Diffstat (limited to 'board/compulab/cm_fx6/cm_fx6.c')
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b5c3ea19d3..ae6945ba9c 100644
--- 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
OpenPOWER on IntegriCloud