qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: fit: support load multiple backup of images 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I29bce60f1b958baedbd2b45e86a611b89547c0d8
This commit is contained in:
Joseph Chen 2020-04-04 11:20:31 +08:00
parent 36c668870e
commit 22c7c1a827
8 changed files with 85 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Kconfig
View File

@ -333,6 +333,20 @@ config SPL_FIT_HW_CRYPTO
help help
Enable SPL hardware crypto for FIT image checksum and rsa verify. Enable SPL hardware crypto for FIT image checksum and rsa verify.
config SPL_FIT_IMAGE_KB
int "SPL FIT image size in KiB"
depends on SPL_FIT
default 2048
help
SPL FIT image size in KiB.
config SPL_FIT_IMAGE_MULTIPLE
int "SPL FIT image multiple number"
depends on SPL_FIT
default 1
help
SPL FIT image multiple number.
config SPL_SYS_DCACHE_OFF config SPL_SYS_DCACHE_OFF
bool "Disable SPL dcache" bool "Disable SPL dcache"
default y default y

6
common/spl/spl_fat.c
View File

@ -71,8 +71,14 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
if (err <= 0) if (err <= 0)
goto end; goto end;
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");

36
common/spl/spl_fit.c
View File

@ -342,8 +342,9 @@ static int spl_fit_image_get_os(const void *fit, int noffset, uint8_t *os)
#endif #endif
} }
int spl_load_simple_fit(struct spl_image_info *spl_image, static int spl_internal_load_simple_fit(struct spl_image_info *spl_image,
struct spl_load_info *info, ulong sector, void *fit) struct spl_load_info *info,
ulong sector, void *fit)
{ {
int sectors; int sectors;
ulong size; ulong size;
@ -528,3 +529,34 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
return 0; return 0;
} }
int spl_load_simple_fit(struct spl_image_info *spl_image,
struct spl_load_info *info, ulong sector, void *fit)
{
ulong sector_offs = sector;
int i;
for (i = 0; i < CONFIG_SPL_FIT_IMAGE_MULTIPLE; i++) {
if (i > 0) {
sector_offs +=
i * ((CONFIG_SPL_FIT_IMAGE_KB << 10) / info->bl_len);
printf("Trying fit image at 0x%lx sector\n", sector_offs);
if (info->read(info, sector_offs, 1, fit) != 1) {
printf("IO error\n");
continue;
}
}
if (image_get_magic(fit) != FDT_MAGIC) {
printf("Bad fit magic\n");
continue;
}
if (!spl_internal_load_simple_fit(spl_image, info,
sector_offs, fit))
return 0;
}
return -EINVAL;
}

6
common/spl/spl_mmc.c
View File

@ -103,8 +103,14 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
goto end; goto end;
} }
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");

6
common/spl/spl_nand.c
View File

@ -85,8 +85,14 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
if (err) if (err)
return err; return err;
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");

6
common/spl/spl_net.c
View File

@ -47,8 +47,14 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
return rv; return rv;
} }
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");

6
common/spl/spl_ram.c
View File

@ -39,8 +39,14 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0"); spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
#endif #endif
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");

8
common/spl/spl_spi.c
View File

@ -113,8 +113,14 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
return err; return err;
} }
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if ((IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
#endif
struct spl_load_info load; struct spl_load_info load;
debug("Found FIT\n"); debug("Found FIT\n");