summaryrefslogtreecommitdiff
path: root/board/compulab
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
parent3a236a356397449bf3ad1e72221053b5a3d87b80 (diff)
downloadu-boot-imx-f82eb2fa5df86b7180ea355a3cb98482f7c27269.zip
u-boot-imx-f82eb2fa5df86b7180ea355a3cb98482f7c27269.tar.gz
u-boot-imx-f82eb2fa5df86b7180ea355a3cb98482f7c27269.tar.bz2
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')
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c5
-rw-r--r--board/compulab/cm_t35/cm_t35.c5
-rw-r--r--board/compulab/common/Makefile1
-rw-r--r--board/compulab/common/common.h21
-rw-r--r--board/compulab/common/splash.c165
5 files changed, 6 insertions, 191 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b5c3ea1..ae6945b 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
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index 8143c05..c4ea8ea 100644
--- 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 dbf0009..286f327 100644
--- 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 b992965..8f38b79 100644
--- 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/board/compulab/common/splash.c b/board/compulab/common/splash.c
deleted file mode 100644
index 16c315c..0000000
--- a/board/compulab/common/splash.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il>
- *
- * Authors: Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <nand.h>
-#include <errno.h>
-#include <spi_flash.h>
-#include <spi.h>
-#include <bmp_layout.h>
-#include "common.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_SPI_FLASH
-static struct spi_flash *sf;
-static int splash_sf_read(u32 bmp_load_addr, int offset, size_t read_size)
-{
- if (!sf) {
- sf = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
- CONFIG_SF_DEFAULT_CS,
- CONFIG_SF_DEFAULT_SPEED,
- CONFIG_SF_DEFAULT_MODE);
- if (!sf)
- return -ENODEV;
- }
-
- return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr);
-}
-#else
-static int splash_sf_read(u32 bmp_load_addr, int offset, size_t read_size)
-{
- debug("%s: sf support not available\n", __func__);
- return -ENOSYS;
-}
-#endif
-
-#ifdef CONFIG_CMD_NAND
-static int splash_nand_read(u32 bmp_load_addr, int offset, size_t read_size)
-{
- return nand_read_skip_bad(&nand_info[nand_curr_device], offset,
- &read_size, NULL,
- nand_info[nand_curr_device].size,
- (u_char *)bmp_load_addr);
-}
-#else
-static int splash_nand_read(u32 bmp_load_addr, int offset, size_t read_size)
-{
- debug("%s: nand support not available\n", __func__);
- return -ENOSYS;
-}
-#endif
-
-static int splash_storage_read(struct splash_location *location,
- u32 bmp_load_addr, size_t read_size)
-{
- u32 offset;
-
- if (!location)
- return -EINVAL;
-
- offset = location->offset;
- switch (location->storage) {
- case SPLASH_STORAGE_NAND:
- return splash_nand_read(bmp_load_addr, offset, read_size);
- case SPLASH_STORAGE_SF:
- return splash_sf_read(bmp_load_addr, offset, read_size);
- default:
- printf("Unknown splash location\n");
- }
-
- return -EINVAL;
-}
-
-static int splash_load_raw(struct splash_location *location, u32 bmp_load_addr)
-{
- struct bmp_header *bmp_hdr;
- int res;
- size_t bmp_size, bmp_header_size = sizeof(struct bmp_header);
-
- if (bmp_load_addr + bmp_header_size >= gd->start_addr_sp)
- goto splash_address_too_high;
-
- res = splash_storage_read(location, bmp_load_addr, bmp_header_size);
- if (res < 0)
- return res;
-
- bmp_hdr = (struct bmp_header *)bmp_load_addr;
- bmp_size = le32_to_cpu(bmp_hdr->file_size);
-
- if (bmp_load_addr + bmp_size >= gd->start_addr_sp)
- goto splash_address_too_high;
-
- 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");
-
- return -EFAULT;
-}
-
-/**
- * select_splash_location - return the splash location based on board support
- * and env variable "splashsource".
- *
- * @locations: An array of supported splash locations.
- * @size: Size of splash_locations array.
- *
- * @return: If a null set of splash locations is given, or
- * splashsource env variable is set to unsupported value
- * return NULL.
- * If splashsource env variable is not defined
- * return the first entry in splash_locations as default.
- * If splashsource env variable contains a supported value
- * return the location selected by splashsource.
- */
-static struct splash_location *select_splash_location(
- struct splash_location *locations, uint size)
-{
- int i;
- char *env_splashsource;
-
- if (!locations || size == 0)
- return NULL;
-
- env_splashsource = getenv("splashsource");
- if (env_splashsource == NULL)
- return &locations[0];
-
- for (i = 0; i < size; i++) {
- if (!strcmp(locations[i].name, env_splashsource))
- return &locations[i];
- }
-
- printf("splashsource env variable set to unsupported value\n");
- return NULL;
-}
-
-int cl_splash_screen_prepare(struct splash_location *locations, uint size)
-{
- struct splash_location *splash_location;
- char *env_splashimage_value;
- u32 bmp_load_addr;
-
- env_splashimage_value = getenv("splashimage");
- if (env_splashimage_value == NULL)
- return -ENOENT;
-
- bmp_load_addr = simple_strtoul(env_splashimage_value, 0, 16);
- if (bmp_load_addr == 0) {
- printf("Error: bad splashimage address specified\n");
- return -EFAULT;
- }
-
- splash_location = select_splash_location(locations, size);
- if (!splash_location)
- return -EINVAL;
-
- return splash_load_raw(splash_location, bmp_load_addr);
-}