mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
efi_loader: rename __efi_hello_world_*
In scripts/Makefile.lib we build section including helloworld.efi. This allows to load the EFI binary with command 'bootefi hello'. scripts/Makefile.lib contains explicit references to strings containing helloworld and hello_world. This makes it impossible to generalize the coding to accomodate additional built in EFI binaries. Let us rename the variables __efi_hello_world_* to __efi_helloworld_*. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
d6507e6fd9
commit
5e44489bc1
3 changed files with 8 additions and 8 deletions
|
@ -297,14 +297,14 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||||
return CMD_RET_USAGE;
|
return CMD_RET_USAGE;
|
||||||
#ifdef CONFIG_CMD_BOOTEFI_HELLO
|
#ifdef CONFIG_CMD_BOOTEFI_HELLO
|
||||||
if (!strcmp(argv[1], "hello")) {
|
if (!strcmp(argv[1], "hello")) {
|
||||||
ulong size = __efi_hello_world_end - __efi_hello_world_begin;
|
ulong size = __efi_helloworld_end - __efi_helloworld_begin;
|
||||||
|
|
||||||
saddr = env_get("loadaddr");
|
saddr = env_get("loadaddr");
|
||||||
if (saddr)
|
if (saddr)
|
||||||
addr = simple_strtoul(saddr, NULL, 16);
|
addr = simple_strtoul(saddr, NULL, 16);
|
||||||
else
|
else
|
||||||
addr = CONFIG_SYS_LOAD_ADDR;
|
addr = CONFIG_SYS_LOAD_ADDR;
|
||||||
memcpy((char *)addr, __efi_hello_world_begin, size);
|
memcpy((char *)addr, __efi_helloworld_begin, size);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,8 +22,8 @@ extern char __kprobes_text_start[], __kprobes_text_end[];
|
||||||
extern char __entry_text_start[], __entry_text_end[];
|
extern char __entry_text_start[], __entry_text_end[];
|
||||||
extern char __initdata_begin[], __initdata_end[];
|
extern char __initdata_begin[], __initdata_end[];
|
||||||
extern char __start_rodata[], __end_rodata[];
|
extern char __start_rodata[], __end_rodata[];
|
||||||
extern char __efi_hello_world_begin[];
|
extern char __efi_helloworld_begin[];
|
||||||
extern char __efi_hello_world_end[];
|
extern char __efi_helloworld_end[];
|
||||||
|
|
||||||
/* Start and end of .ctors section - used for constructor calls. */
|
/* Start and end of .ctors section - used for constructor calls. */
|
||||||
extern char __ctors_start[], __ctors_end[];
|
extern char __ctors_start[], __ctors_end[];
|
||||||
|
|
|
@ -367,11 +367,11 @@ cmd_S_efi= \
|
||||||
( \
|
( \
|
||||||
echo '.section .rodata.efi.init,"a"'; \
|
echo '.section .rodata.efi.init,"a"'; \
|
||||||
echo '.balign 16'; \
|
echo '.balign 16'; \
|
||||||
echo '.global __efi_hello_world_begin'; \
|
echo '.global __efi_helloworld_begin'; \
|
||||||
echo '__efi_hello_world_begin:'; \
|
echo '__efi_helloworld_begin:'; \
|
||||||
echo '.incbin "$<" '; \
|
echo '.incbin "$<" '; \
|
||||||
echo '__efi_hello_world_end:'; \
|
echo '__efi_helloworld_end:'; \
|
||||||
echo '.global __efi_hello_world_end'; \
|
echo '.global __efi_helloworld_end'; \
|
||||||
echo '.balign 16'; \
|
echo '.balign 16'; \
|
||||||
) > $@
|
) > $@
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue