splash: add more options/support
v2 cover splash: add more options/support
This patch series add several options/support for splashscreen feature:
- support raw image from MMC
- get devpart from environment variable
With these changes the user has now more options and can change default configurations through environment variables.
Example: image located in splashscreen partition (MMC as raw)
``` splashsource=mmc_raw splashdevpart=0#splashscreen ```
Changes in v2:
- splash_mmc_read_raw: return -EIO in case of errors
- splash_mmc_read_raw: use IS_ENABLED(CONFIG_CMD_MMC) instead of #ifdef
- rename local var env_splashdevpart_value to devpart
Julien Masson (2):
splash: support raw image from MMC
splash: get devpart from environment variable
common/splash.c | 6 ++++++ common/splash_source.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
Signature · 1 line
2.37.3
PATCH v2 1/2 splash: support raw image from MMC
The user has now the choice to specify the splash location in the MMC as a raw storage.
---
Changes in v2:
- splash_mmc_read_raw: return -EIO in case of errors
- splash_mmc_read_raw: use IS_ENABLED(CONFIG_CMD_MMC) instead of #ifdef
common/splash.c | 6 ++++++ common/splash_source.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
common/splash.c +6 -0
@@ -39,6 +39,12 @@ static struct splash_location default_splash_locations[] = { .flags = SPLASH_STORAGE_FS, .devpart = "0:1", }, + { + .name = "mmc_raw", + .storage = SPLASH_STORAGE_MMC, + .flags = SPLASH_STORAGE_RAW, + .devpart = "0:1", + }, { .name = "usb_fs", .storage = SPLASH_STORAGE_USB,
common/splash_source.c +26 -0
@@ -65,6 +65,30 @@ static int splash_nand_read_raw(u32 bmp_load_addr, int offset, size_t read_size) }#endif +static int splash_mmc_read_raw (u32 bmp_load_addr,struct splash_location *location, +size_t read_size) +{ +struct disk_partition partition; +struct blk_desc *desc; +lbaint_t blkcnt; +int ret, n; + +if (!IS_ENABLED (CONFIG_CMD_MMC )) { +debug ("%s: mmc support not available\n" , __func__); +return -ENOSYS ; + } + + ret =part_get_info_by_dev_and_name_or_num ("mmc" , location->devpart, &desc, + &partition,1 ); +if (ret <0 ) +return ret; + + blkcnt =DIV_ROUND_UP (read_size, partition.blksz); + n =blk_dread (desc, partition.start, blkcnt, (void *)(uintptr_t )bmp_load_addr); + +return (n == blkcnt) ?0 : -EIO ; +} +static int splash_storage_read_raw (struct splash_location *location,u32 bmp_load_addr,size_t read_size) {
@@ -75,6 +99,8 @@ static int splash_storage_read_raw(struct splash_location *location, offset = location->offset;switch (location->storage) { +case SPLASH_STORAGE_MMC : +return splash_mmc_read_raw (bmp_load_addr, location, read_size);case SPLASH_STORAGE_NAND :return splash_nand_read_raw (bmp_load_addr, offset, read_size);case SPLASH_STORAGE_SF :
Signature · 1 line
2.37.3
PATCH v2 2/2 splash: get devpart from environment variable
In reply to Julien MassonBy default several types of splash locations are supported and the user can select one of them through environment var (splashsource).
However the devpart is still hardcoded and we cannot change it from the environment.
This patch add the support of "splashdevpart" which allow the user to set the devpart though this environment variable.
Example: image located in splashscreen partition (MMC as raw)
``` splashsource=mmc_raw splashdevpart=0#splashscreen ```
---
Changes in v2:
- rename local var env_splashdevpart_value to devpart
common/splash_source.c | 5 +++++ 1 file changed, 5 insertions(+)
common/splash_source.c +5 -0
@@ -448,6 +448,7 @@ int splash_source_load(struct splash_location *locations, uint size) {struct splash_location *splash_location;char *env_splashimage_value; +char *devpart;u32 bmp_load_addr; env_splashimage_value =env_get ("splashimage" );
@@ -464,6 +465,10 @@ int splash_source_load(struct splash_location *locations, uint size)if (!splash_location)return -EINVAL ; + devpart =env_get ("splashdevpart" ); +if (devpart) + splash_location->devpart = devpart; +if (splash_location->flags ==SPLASH_STORAGE_RAW )return splash_load_raw (splash_location, bmp_load_addr);else if (splash_location->flags ==SPLASH_STORAGE_FS )
Signature · 1 line
2.37.3
Re: [PATCH v2 1/2] splash: support raw image from MMC
In reply to Julien MassonQuoted 7 lines · Julien Masson
The user has now the choice to specify the splash location in the MMC as a raw storage.
Signed-off-by Julien Masson <[email protected]>---
Quoted 7 lines
Changes in v2:
-splash_mmc_read_raw: return-EIOin case of errors
-splash_mmc_read_raw: useIS_ENABLED(CONFIG_CMD_MMC)instead of #ifdefcommon/splash.c | 6 ++++++ common/splash_source.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
Re: [PATCH v2 2/2] splash: get devpart from environment variable
In reply to Julien MassonQuoted 18 lines · Julien Masson
By default several types of splash locations are supported and the user can select one of them through environment var (splashsource).
However the devpart is still hardcoded and we cannot change it from the environment.
This patch add the support of "splashdevpart" which allow the user to set the devpart though this environment variable.
Example: image located in splashscreen partition (MMC as raw)
``` splashsource=mmc_raw splashdevpart=0#splashscreen ```Reviewed-by Simon Glass <[email protected]>Signed-off-by Julien Masson <[email protected]>
Quoted 7 lines
---
Changes in v2:
- rename local varenv_splashdevpart_valueto devpartcommon/splash_source.c | 5 +++++ 1 file changed, 5 insertions(+)
On Mon, 17 Oct 2022 10:33:18 +0200
Julien Masson [email protected] wrote:
...
Quoted 5 lines
Changes in v2:
-splash_mmc_read_raw: return-EIOin case of errors
-splash_mmc_read_raw: useIS_ENABLED(CONFIG_CMD_MMC)instead of #ifdef
- rename local varenv_splashdevpart_valueto devpart
Quoted 8 lines
Julien Masson (2):
splash: support raw image from MMC
splash: get devpart from environment variablecommon/splash.c | 6 ++++++ common/splash_source.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
Applied to u-boot-video/master, thanks!
--
Anatolij