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

common: android: allow failed to overly dtbo 

Restore main fdt if it's destroyed by fdt_overlay_apply()
when overlay failed.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id26085f2df89d208caadeb3c4ce33f21f896ee22
This commit is contained in:
Joseph Chen 2020-11-09 10:06:44 +08:00
parent 2217694352
commit 713cdac3a7
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/android_bootloader.c
View File

@ -797,9 +797,11 @@ int android_fdt_overlay_apply(void *fdt_addr)
struct blk_desc *dev_desc; struct blk_desc *dev_desc;
const char *part_boot; const char *part_boot;
disk_partition_t part_info; disk_partition_t part_info;
char *fdt_backup;
char *part_dtbo; char *part_dtbo;
char buf[32] = {0}; char buf[32] = {0};
ulong fdt_dtbo = -1; ulong fdt_dtbo = -1;
u32 totalsize;
int index = -1; int index = -1;
int ret; int ret;
@ -843,6 +845,7 @@ int android_fdt_overlay_apply(void *fdt_addr)
ret = android_get_dtbo(&fdt_dtbo, (void *)hdr, &index, part_dtbo); ret = android_get_dtbo(&fdt_dtbo, (void *)hdr, &index, part_dtbo);
if (!ret) { if (!ret) {
phys_size_t fdt_size; phys_size_t fdt_size;
/* Must incease size before overlay */ /* Must incease size before overlay */
fdt_size = fdt_totalsize((void *)fdt_addr) + fdt_size = fdt_totalsize((void *)fdt_addr) +
fdt_totalsize((void *)fdt_dtbo); fdt_totalsize((void *)fdt_dtbo);
@ -853,6 +856,16 @@ int android_fdt_overlay_apply(void *fdt_addr)
(phys_addr_t)fdt_addr, (phys_addr_t)fdt_addr,
fdt_size + CONFIG_SYS_FDT_PAD)) fdt_size + CONFIG_SYS_FDT_PAD))
goto out; goto out;
/*
* Backup main fdt in case of being destroyed by
* fdt_overlay_apply() when it overlys failed.
*/
totalsize = fdt_totalsize(fdt_addr);
fdt_backup = malloc(totalsize);
if (!fdt_backup)
goto out;
memcpy(fdt_backup, fdt_addr, totalsize);
fdt_increase_size(fdt_addr, fdt_totalsize((void *)fdt_dtbo)); fdt_increase_size(fdt_addr, fdt_totalsize((void *)fdt_dtbo));
ret = fdt_overlay_apply(fdt_addr, (void *)fdt_dtbo); ret = fdt_overlay_apply(fdt_addr, (void *)fdt_dtbo);
if (!ret) { if (!ret) {
@ -860,8 +873,11 @@ int android_fdt_overlay_apply(void *fdt_addr)
env_update("bootargs", buf); env_update("bootargs", buf);
printf("ANDROID: fdt overlay OK\n"); printf("ANDROID: fdt overlay OK\n");
} else { } else {
memcpy(fdt_addr, fdt_backup, totalsize);
printf("ANDROID: fdt overlay failed, ret=%d\n", ret); printf("ANDROID: fdt overlay failed, ret=%d\n", ret);
} }
free(fdt_backup);
} }
out: out: