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

common: android: simplify fdt/ramdisk skip reloc 

bootm_board_start() takes over it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8a9e3287ad5ca5964809f689bd204cbc2e37468f
This commit is contained in:
Joseph Chen 2020-02-07 12:39:49 +08:00 committed by Jianhong Chen
parent 5cadaea8d7
commit 7460c07a1d
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/android_bootloader.c
View File

@ -484,8 +484,6 @@ static int sysmem_alloc_uncomp_kernel(ulong andr_hdr,
if (!sysmem_alloc_base(MEM_UNCOMP_KERNEL, if (!sysmem_alloc_base(MEM_UNCOMP_KERNEL,
(phys_addr_t)kaddr, ksize)) (phys_addr_t)kaddr, ksize))
return -ENOMEM; return -ENOMEM;
hotkey_run(HK_SYSMEM);
} }
return 0; return 0;
@ -541,9 +539,6 @@ int android_bootloader_boot_kernel(unsigned long kernel_address)
comp_type)) comp_type))
return -1; return -1;
/* Check sysmem overflow */
sysmem_overflow_check();
return do_bootm_states(NULL, 0, ARRAY_SIZE(bootm_args), bootm_args, return do_bootm_states(NULL, 0, ARRAY_SIZE(bootm_args), bootm_args,
BOOTM_STATE_START | BOOTM_STATE_START |
BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER | BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER |

20
common/image-android.c
View File

@ -415,8 +415,6 @@ static int android_image_separate(struct andr_img_hdr *hdr,
void *load_address, void *load_address,
void *ram_base) void *ram_base)
{ {
char *initrd_high;
char *fdt_high;
ulong bstart; ulong bstart;
if (android_image_check_header(hdr)) { if (android_image_check_header(hdr)) {
@ -504,22 +502,8 @@ static int android_image_separate(struct andr_img_hdr *hdr,
} }
#endif #endif
/* /* 2. Disable fdt/ramdisk relocation, it saves boot time */
* 2. Disable fdt/ramdisk relocation, it saves boot time. env_set("bootm-no-reloc", "y");
*/
initrd_high = env_get("initrd_high");
fdt_high = env_get("fdt_high");
if (!fdt_high) {
env_set_hex("fdt_high", -1UL);
printf("Fdt ");
}
if (!initrd_high) {
env_set_hex("initrd_high", -1UL);
printf("Ramdisk ");
}
if (!fdt_high || !initrd_high)
printf("skip relocation\n");
return 0; return 0;
} }