From patchwork Tue Sep 5 01:19:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 809887 X-Patchwork-Delegate: agraf@suse.de 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 3xmTTL6TbFz9s7f for ; Tue, 5 Sep 2017 11:21:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A606BC21E52; Tue, 5 Sep 2017 01:21:12 +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 045A1C21F4A; Tue, 5 Sep 2017 01:20:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A241EC21F1F; 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 306CDC21F12 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 0MJSx9-1dn6T40JiN-0032g9; Tue, 05 Sep 2017 03:20:33 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Tue, 5 Sep 2017 03:19:38 +0200 Message-Id: <20170905011939.5794-3-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:LczoANj9KgH9u+oY7Gn2TEpXn6qS1cyyNBswc5hhh9q+9kvR4Ib AVtSQQ2LizMlymFNYDRKYL7UyxPGyu5eRPzwkttdocw7JivnQj34k8/kUn607UnR/9/LJxV oJ5iIJOliGpbo17y/L0Dtr07bIld2fs5lFm/IDOW4mQtbt9uORl7NmU3GuN///GzDUNGoBP xYRB0Cnqb+FEnZB6UvGEw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Xy9l7ldCWa8=:tCGCynoNgJ699ldj9xuhOR osuw8S9RnZlNW4UI77qdz7wc2XGIwwBJt4wNuShV52auj51Zlz/6Ak2hl7nkE4eJYFh0pGp93 1AAdCioy1GMtxZHx2w6Sm3AKadvmXjZtUjOe+aynr7H/s+daGf5BjBUgzZHJ1GYAjqnc95BPI CBOq6+nJcA9anRqgtTkiRrYY64QupIMaBHr/kMv9pumUQMIXbr61AR/T3ZRos7WzG2ttf/z5x Jv8xGLxi8oUI+tNcUNENm49H6ABcdGIQjkAArm+qvj6SZ4k+/SkJYCmkVjEoYa68BulW582ad CVD5pIq2V4Aub1620UcfF5x/FZ3uPc7kIhCOXPXAWzC7x7P2B1B9lULorl6wJ4reArZtNnF7Q 0PX4roM1XKmNzKwjgSyfMhQhPAduLSFZzY69poEKfXpZLl0UWxHGo7N6zlLkww6MEQLt6lGBH gjppKbjpnRUdMk46n6VKOYX7ylrFrEml9YcPVKlzFu2OBtlK0xnc/Cye3xiP0oBUe89b2UKPf dm8Vwlnve6L6VlZ0DRgAI5SGWZ8dKcrbCCwFHq1MlsJc5XvLroTF1a0vqH3PeMa5BMM+W39Oi rC/DFDHMeqsYA4iIsEuz4wUInFIhIyA8ZRKnesxPPE5AjMaDrtwPqBVcN08d0R+ZAdsoqg6rZ YuOQWCxBqVj0DdPT/9S4GHpvuKgdEC2B3W8LHSAMIZ2Feb/8ZYZEsSDl/enBcRYpZJ4txYYQa 95WfYEUEApghM+MaAVgfEi/iw8Ewtprtu1glNE7Mex9Pq7LOGdjg5GXNMwItGtgQtUtI2qasp QXWpVbpG+jeayHBJ9HNVYDy9yKrgDj/0t2PsA6rMLWuxwpwblQ= Cc: Mark Kettenis , Heinrich Schuchardt , Andy Shevchenko , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/3] scripts/Makefile.lib: generalize building built in EFI app 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" Replace all occurences of helloworld by generalized forms. This allows us to build additional EFI applications that are included into the U-Boot binary without loading scripts/Makefile.lib with specific filenames. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- scripts/Makefile.lib | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 164c234b4c..c73464b854 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -342,20 +342,22 @@ cmd_S_ttf= \ $(obj)/%.S: $(src)/%.ttf $(call cmd,S_ttf) -# EFI Hello World application +# EFI applications +# A Makefile target *.efi is built as EFI application. +# A Makefile target *_efi.S wraps *.efi as built-in EFI application. # --------------------------------------------------------------------------- # Generate an assembly file to wrap the EFI app -cmd_S_efi= \ -( \ - echo '.section .rodata.efi.init,"a"'; \ - echo '.balign 16'; \ - echo '.global __efi_helloworld_begin'; \ - echo '__efi_helloworld_begin:'; \ - echo '.incbin "$<" '; \ - echo '__efi_helloworld_end:'; \ - echo '.global __efi_helloworld_end'; \ - echo '.balign 16'; \ +cmd_S_efi= \ +( \ + echo '.section .rodata.$*.init,"a"'; \ + echo '.balign 16'; \ + echo '.global __efi_$*_begin'; \ + echo '__efi_$*_begin:'; \ + echo '.incbin "$<" '; \ + echo '__efi_$*_end:'; \ + echo '.global __efi_$*_end'; \ + echo '.balign 16'; \ ) > $@ $(obj)/%_efi.S: $(obj)/%.efi @@ -366,7 +368,7 @@ cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \ .dynamic -j .dynsym -j .rel* -j .rela* -j .reloc \ $(if $(EFI_TARGET),$(EFI_TARGET),-O binary) $^ $@ -$(obj)/%.efi: $(obj)/%.so +$(obj)/%.efi: $(obj)/%_efi.so $(call cmd,efi_objcopy) quiet_cmd_efi_ld = LD $@ @@ -375,7 +377,7 @@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) -$(obj)/helloworld.so: $(obj)/helloworld.o arch/$(ARCH)/lib/$(EFI_CRT0) \ +$(obj)/%_efi.so: $(obj)/%.o $(%_deps) arch/$(ARCH)/lib/$(EFI_CRT0) \ arch/$(ARCH)/lib/$(EFI_RELOC) $(call cmd,efi_ld)