From patchwork Tue Sep 5 01:19:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 809885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xmTSZ43DRz9s7f for ; Tue, 5 Sep 2017 11:21:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0F285C21F2F; Tue, 5 Sep 2017 01:20:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30917C21F4E; Tue, 5 Sep 2017 01:20:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 62215C21F4A; Tue, 5 Sep 2017 01:20:43 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id 53796C21DA0 for ; Tue, 5 Sep 2017 01:20:40 +0000 (UTC) Received: from laptop1.fritz.box ([94.197.121.125]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LiTm8-1dCOrj1aCS-00cesU; Tue, 05 Sep 2017 03:20:31 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Tue, 5 Sep 2017 03:19:37 +0200 Message-Id: <20170905011939.5794-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170905011939.5794-1-xypron.glpk@gmx.de> References: <20170905011939.5794-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:DSrBC8PJkz2cgzGndRFWk5tULb1RNY7++TLAVZvu5yEMH8yFjW8 +FEKb8IsdqSS41F7mNrJxGCQY2iALCeGCT2+qzJOBg3H7JetEwvpttONz6KvmfjntRq8TOI uyj0ZumuCOLoj4HQxvwMZP9x3geMla+tTQtm0AAia0uh1pkfgNGOQ2426HmAAkP38yQdpc2 jnDMTe1/NSDMBhmOkzStQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:nHSIx4zoGd0=:8kvqA2NZXArpichC59No5x CNgCB29mMg2yxt3ha15KXsZJ2wMXVnChur+MNyr+yKRbCSEapXNDzzSWPoMAErfcVp4ktny0/ vW92GjppsgLKydpoRwF1EN01t6SOVuCoI+1ZKqjUboTXordPh8IpvKn5KxI1LKVbdZJkmYwbF 5gFBzej6gofGaKi+9B4/p8+gP84QX9aouLKJOMSCl68oZjgddX0lbtBCPb2XcBVwBMEmZs5iM zSt82VM0Ag7ug0V9WLsy5SSTQ3ifm8F9qVY+kHPQm/ziSd/5+gja476/RPUqP3ccUzUpu+Nd8 9ec1FqnckQdDRfL2zdeFokJcvH1C8V2kZSPSuFw5BNDaOKwVlPDsZliTb4mDMyKB4bpYmv206 5CTdxZoF/Ye4LYdcdPdML7CbY1vL+bOHvwU1kVoZCJ9d4GRneFpr3exBY6TjLlY5zsuYHAegt KnZ+cLeAyEYoNYBDXxW6lmjvahmp7WL1XspvyLk31N2L0trHZDmRcox4f7PQlWRkbW5ecYDkS yV0YcJyB1PoDaaIzBPij5U947X+JTUlum3r3jW5ro4T51LXpOPfHxa9R1EDdzDAifYS1MzhmH +ENrKoysp1vPHyZV0Xg2j3YbkMebehJ2plu1z42xmPJX+qsXXCmzAtvoycXpWN5GDPTUcUKM9 1fCC8wja0vIvS24smdNXv5HVID7ub/NbID97dPmVLPPaDJmDLBtsRPWqEUh6m/g0Nr8XheXa0 fTCG8/fzhZR97iyYqiX+Y4cD3sR7PBEq7QJjpn/YpW1Ab8cs3BVGmGkSPhqpbBHSZ7lnGP4Zn u8Aj8Le6N0Sk+9v8kFRcuUkQNNRXxaFSzC3ok6bqtg8rWI6e0w= Cc: Mark Kettenis , Heinrich Schuchardt , Andy Shevchenko , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/3] efi_loader: rename __efi_hello_world_* X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Simon Glass --- cmd/bootefi.c | 4 ++-- include/asm-generic/sections.h | 4 ++-- scripts/Makefile.lib | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index a3768158a2..c5bfab1147 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -298,14 +298,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 7f97e8ebf3..164c234b4c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -350,11 +350,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'; \ ) > $@