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>

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index c65c619d6363045fab06de3a9674eded7dc42d6c..ffd50ba15926f0d630d1e97aa6fb7edea1e475aa 100644 (file)
--- 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 daf021b647e6fdfa6d6baf091eaad707f58b55bb..b6535705a52003a5f047ec2d0aceb3af62abcc47 100644 (file)
--- 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 7bf6ef12a01e50c34a85742a4c87fa409d41bc38..320e6c0ef0ec6b8b7be407d0859160bcda2ede7e 100644 (file)
--- 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';                              \
 ) > $@