From patchwork Tue Jun 12 17:27:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 928431 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 414xh7497xz9s0W for ; Wed, 13 Jun 2018 03:29:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 49102C21DFD; Tue, 12 Jun 2018 17:28:32 +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 AE3F4C21DFF; Tue, 12 Jun 2018 17:28:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 05006C21DFB; Tue, 12 Jun 2018 17:28:14 +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 299B1C21DA1 for ; Tue, 12 Jun 2018 17:28:11 +0000 (UTC) Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) by smtp-cloud8.xs4all.net with ESMTP id Sn5RfC4VUW4tcSn5Wf1YQy; Tue, 12 Jun 2018 19:28:11 +0200 From: Mark Kettenis To: u-boot@lists.denx.de Date: Tue, 12 Jun 2018 19:27:48 +0200 Message-Id: <20180612172748.36790-4-kettenis@openbsd.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180612172748.36790-1-kettenis@openbsd.org> References: <20180612172748.36790-1-kettenis@openbsd.org> X-CMAE-Envelope: MS4wfPhMvxNUeGM3i/e/pQAB+NJG9CUfM3Tc6+8sAnHpS71N6Z/jZKyKgxLbrkhC8oVI9hTw7DJ6lyTH53FXZ1p/k/oXod0YngvQUkcCs+RiDh6UjjHi0QE5 HPAOGQOKIi4e0jscSiPvY5fb8KbGBV2MDo3gIlWMq5KNaSx4jdjpaFYl5ImYFhIDuwkbakkJQuITE2LZg3jbHVfzmyL37VXrPupyW9tSoJlS1YKkLcSrodZh BVT5tunJVxFMCZE1ee4EW235W+L17jBHMfl+MgcYQypLH92+D0PE7Bo/Mx6AtxBdrgwQMk9Aud2lrKgEeZZth2rJIyjD54lVZ4AyVOEtlP7PsRumoaoWaH6c SgBogPjA Cc: marc.zyngier@arm.com, xypron.glpk@gmx.de, Mark Kettenis , agraf@suse.de, andre.przywara@arm.com Subject: [U-Boot] [PATCH 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