diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2017-09-05 03:19:37 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2017-09-18 23:53:56 +0200 |
| commit | 5e44489bc19dad344e0019f4a6926aa5f29b4456 (patch) | |
| tree | 1cc096ca1990277c716b0285a4717683e695be31 | |
| parent | d6507e6fd9e0a6f1a8dd28c18cd320c1f861269e (diff) | |
| download | u-boot-5e44489bc19dad344e0019f4a6926aa5f29b4456.tar.gz | |
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>
| -rw-r--r-- | cmd/bootefi.c | 4 | ||||
| -rw-r--r-- | include/asm-generic/sections.h | 4 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index c65c619d63..ffd50ba159 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -297,14 +297,14 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_USAGE; #ifdef CONFIG_CMD_BOOTEFI_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"); if (saddr) addr = simple_strtoul(saddr, NULL, 16); else addr = CONFIG_SYS_LOAD_ADDR; - memcpy((char *)addr, __efi_hello_world_begin, size); + memcpy((char *)addr, __efi_helloworld_begin, size); } else #endif { diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index daf021b647..b6535705a5 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -22,8 +22,8 @@ extern char __kprobes_text_start[], __kprobes_text_end[]; extern char __entry_text_start[], __entry_text_end[]; extern char __initdata_begin[], __initdata_end[]; extern char __start_rodata[], __end_rodata[]; -extern char __efi_hello_world_begin[]; -extern char __efi_hello_world_end[]; +extern char __efi_helloworld_begin[]; +extern char __efi_helloworld_end[]; /* Start and end of .ctors section - used for constructor calls. */ extern char __ctors_start[], __ctors_end[]; diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 7bf6ef12a0..320e6c0ef0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -367,11 +367,11 @@ cmd_S_efi= \ ( \ echo '.section .rodata.efi.init,"a"'; \ echo '.balign 16'; \ - echo '.global __efi_hello_world_begin'; \ - echo '__efi_hello_world_begin:'; \ + echo '.global __efi_helloworld_begin'; \ + echo '__efi_helloworld_begin:'; \ echo '.incbin "$<" '; \ - echo '__efi_hello_world_end:'; \ - echo '.global __efi_hello_world_end'; \ + echo '__efi_helloworld_end:'; \ + echo '.global __efi_helloworld_end'; \ echo '.balign 16'; \ ) > $@ |