From patchwork Wed Jun 13 22:41:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 929119 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=openbsd.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 415hbG2z0Nz9s0W for ; Thu, 14 Jun 2018 08:42:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 20A9DC21D8A; Wed, 13 Jun 2018 22:42:07 +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.0 required=5.0 tests=none 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 52212C21CB1; Wed, 13 Jun 2018 22:41:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6BE9EC21E1E; Wed, 13 Jun 2018 22:41:19 +0000 (UTC) Received: from lb1-smtp-cloud8.xs4all.net (lb1-smtp-cloud8.xs4all.net [194.109.24.21]) by lists.denx.de (Postfix) with ESMTPS id 81EA0C21E02 for ; Wed, 13 Jun 2018 22:41:15 +0000 (UTC) Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) by smtp-cloud8.xs4all.net with ESMTP id TERyfTNTBtZGaTES3fYsS0; Thu, 14 Jun 2018 00:41:15 +0200 From: Mark Kettenis To: u-boot@lists.denx.de Date: Thu, 14 Jun 2018 00:41:08 +0200 Message-Id: <20180613224108.13372-4-kettenis@openbsd.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180613224108.13372-1-kettenis@openbsd.org> References: <20180613224108.13372-1-kettenis@openbsd.org> X-CMAE-Envelope: MS4wfHik2NAOXqXCHrKcUA0OquvvhkfyQjB3lsIsHcoIimDtyusyicJjjofQX/DeOLwunHRsrp1lbIa3eP9QshQifGmAzgZPJrKcEuB0U1D2W/vFI3x864N2 21mPZOA14Ra0KAns92L8t79qwiVVVpJusjQ7F3guJ7P/X+ru7XT4GJSiYT3Vh4aJhDl8h910PrxF8W28AQ+xttla4WgXbh9CsC5UI/olAgc//Nx++6zN7wWp cnac/DGoWyPJS/LhYB38phK/mYsu8bWQswNTt9Fw619OC6HX4ykzFLnyla1V5qTRsUCRfzi0zRpnfY0aXSa71ONs5nteWQYdt4ZZDkHMna16oD3JQzJhCnln fgqDD6dn Cc: marc.zyngier@arm.com, xypron.glpk@gmx.de, Mark Kettenis , agraf@suse.de, andre.przywara@arm.com Subject: [U-Boot] [PATCH v3 3/3] Revert "efi_loader: no support for ARMV7_NONSEC=y" 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" This reverts commit c524997acb3d322e1bbd36c06ad02ef589705e7c. Booting ARMv7 in non-secure mode using bootefi works now. Signed-off-by: Mark Kettenis --- doc/README.uefi | 2 -- lib/efi_loader/Kconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/doc/README.uefi b/doc/README.uefi index d4031ef8e8..6b9759cfed 100644 --- a/doc/README.uefi +++ b/doc/README.uefi @@ -329,8 +329,6 @@ This driver is only available if U-Boot is configured with * persistence * runtime support -* support bootefi booting ARMv7 in non-secure mode (CONFIG_ARMV7_NONSEC=y) - ## Links * [1](http://uefi.org/specifications) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index df58e633d1..ce6a09f0b4 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -1,8 +1,6 @@ config EFI_LOADER bool "Support running EFI Applications in U-Boot" depends on (ARM || X86 || RISCV) && OF_LIBFDT - # We do not support bootefi booting ARMv7 in non-secure mode - depends on !ARMV7_NONSEC # We need EFI_STUB_64BIT to be set on x86_64 with EFI_STUB depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB