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

cmd: bootrkp: simplify fdt/ramdisk skip reloc 

bootm_board_start() takes over it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie1df21ee3ff929a5fa7163216d90315277f6cfd5
This commit is contained in:
Joseph Chen 2020-02-07 12:37:14 +08:00 committed by Jianhong Chen
parent 85cad72d55
commit a4696473d2
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/bootrkp.c
View File

@ -161,25 +161,6 @@ static void boot_lmb_init(bootm_headers_t *images)
} }
#endif #endif
static void fdt_ramdisk_skip_relocation(void)
{
char *ramdisk_high = env_get("initrd_high");
char *fdt_high = env_get("fdt_high");
if (!fdt_high) {
env_set_hex("fdt_high", -1UL);
printf("Fdt ");
}
if (!ramdisk_high) {
env_set_hex("initrd_high", -1UL);
printf("Ramdisk ");
}
if (!fdt_high || !ramdisk_high)
printf("skip relocation\n");
}
/* /*
* non-OTA packaged kernel.img & boot.img return the image size on success, * non-OTA packaged kernel.img & boot.img return the image size on success,
* and a negative value on error. * and a negative value on error.
@ -293,14 +274,12 @@ static int boot_rockchip_image(struct blk_desc *dev_desc,
} }
} }
env_set("bootm-no-reloc", "y");
printf("fdt @ 0x%08lx (0x%08x)\n", fdt_addr_r, fdt_totalsize(fdt_addr_r)); printf("fdt @ 0x%08lx (0x%08x)\n", fdt_addr_r, fdt_totalsize(fdt_addr_r));
printf("kernel @ 0x%08lx (0x%08x)\n", kernel_addr_r, kernel_size); printf("kernel @ 0x%08lx (0x%08x)\n", kernel_addr_r, kernel_size);
printf("ramdisk @ 0x%08lx (0x%08x)\n", ramdisk_addr_r, ramdisk_size); printf("ramdisk @ 0x%08lx (0x%08x)\n", ramdisk_addr_r, ramdisk_size);
fdt_ramdisk_skip_relocation();
hotkey_run(HK_SYSMEM);
sysmem_overflow_check();
#if defined(CONFIG_ARM64) #if defined(CONFIG_ARM64)
char cmdbuf[64]; char cmdbuf[64];
@ -326,9 +305,6 @@ static int boot_rockchip_image(struct blk_desc *dev_desc,
return -ENOMEM; return -ENOMEM;
} }
hotkey_run(HK_SYSMEM);
sysmem_overflow_check();
boot_lmb_init(&images); boot_lmb_init(&images);
images.ep = kernel_addr_r; images.ep = kernel_addr_r;
images.initrd_start = ramdisk_addr_r; images.initrd_start = ramdisk_addr_r;