From a4696473d25a1b0ba4375306252d873b6c2785be Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 7 Feb 2020 12:37:14 +0800 Subject: [PATCH] cmd: bootrkp: simplify fdt/ramdisk skip reloc bootm_board_start() takes over it. Signed-off-by: Joseph Chen Change-Id: Ie1df21ee3ff929a5fa7163216d90315277f6cfd5 --- cmd/bootrkp.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/cmd/bootrkp.c b/cmd/bootrkp.c index b79d0471d6..1f23f9f2da 100644 --- a/cmd/bootrkp.c +++ b/cmd/bootrkp.c @@ -161,25 +161,6 @@ static void boot_lmb_init(bootm_headers_t *images) } #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, * 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("kernel @ 0x%08lx (0x%08x)\n", kernel_addr_r, kernel_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) char cmdbuf[64]; @@ -326,9 +305,6 @@ static int boot_rockchip_image(struct blk_desc *dev_desc, return -ENOMEM; } - hotkey_run(HK_SYSMEM); - sysmem_overflow_check(); - boot_lmb_init(&images); images.ep = kernel_addr_r; images.initrd_start = ramdisk_addr_r;