From bb33c79e47e6ae4b538702b8f3d9a8ffc4b637ea Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 12 Jan 2021 17:44:08 +0100 Subject: [PATCH] efi_loader: simplify running helloworld.efi Currently when executing 'bootefi hello' we copy helloworld.efi to the address identified by environment variable loadaddr. This is unexected behavior for a user. There is no need to copy helloworld.efi before executing it after relocation. Remove the copy action. Signed-off-by: Heinrich Schuchardt --- cmd/bootefi.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index fdf909f8da..c82a5bacf6 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -403,19 +403,9 @@ static int do_bootefi_image(const char *image_opt) #ifdef CONFIG_CMD_BOOTEFI_HELLO if (!strcmp(image_opt, "hello")) { - char *saddr; - - saddr = env_get("loadaddr"); + image_buf = __efi_helloworld_begin; size = __efi_helloworld_end - __efi_helloworld_begin; - if (saddr) - addr = simple_strtoul(saddr, NULL, 16); - else - addr = CONFIG_SYS_LOAD_ADDR; - - image_buf = map_sysmem(addr, size); - memcpy(image_buf, __efi_helloworld_begin, size); - efi_free_pool(bootefi_device_path); efi_free_pool(bootefi_image_path); bootefi_device_path = NULL; -- 2.39.5