From patchwork Wed Sep 18 01:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1163652 X-Patchwork-Delegate: xypron.glpk@gmx.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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="HU1bkF4e"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46Y2Ws6xy9z9s4Y for ; Wed, 18 Sep 2019 11:31:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9C73CC21EF2; Wed, 18 Sep 2019 01:26:52 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 45B26C21F00; Wed, 18 Sep 2019 01:25:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E689C21E7D; Wed, 18 Sep 2019 01:23:51 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 47DB6C21DB5 for ; Wed, 18 Sep 2019 01:23:48 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id u17so2990552pgi.6 for ; Tue, 17 Sep 2019 18:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/WUJ5Lpc9tWEsTQYEUVBWcMfBbKcpdSH1ruiElEaCQ0=; b=HU1bkF4evC7xFNyiYrONAixsVY3uQ5rjccVMyOTLz50QiOEL1XNZH3SITDCPDvedya gHgy0dDlvO0CZtUIHDdRmGoQKd2IJ2l1eUkvAnvSJmFNUgO3DB1xcHrOegf0id43UWWQ lSJ27Bcn4KmZW6ra8LGudF6F4CqSBSaJxr07Vuhcnbro4nxOxh4F92GlrltesW7aXkQf HH+A2WdvIdUlHMjOkWTYir6q3+yCLFZKqJTuwfDnYLvCI9L3RGxo1nhFT9ArVd2m4iJ+ 892A0bH9P5L+zB17gA7U0MiQy9hB1RPfa+k5XMh+iNvA2CR6H9CC2HiKEG30QhBD+4ZV WLJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/WUJ5Lpc9tWEsTQYEUVBWcMfBbKcpdSH1ruiElEaCQ0=; b=GaRG1bNIN2hsomWQL8zVOwElE65vr+jwJeUcDWbZNoMm2t9DU+K8Z3hDWJ0jp9izYD pp9UuGu7wxXgOszB8dt/dP5Xz6x0Qhut8m5W6TqlaOhF2CjfykyFyekmrmeUC2j0Hho9 dvjc6Gk0ORRwLW0ZXo3/wPDEqP9i5RYEkyZQzRLcG17V0P/qAAUnBGy1Fl9b5YqZvLxj nZVPhZptWAgVzIF27kBXK+qxUl3aaPnlTqH2/RbyDCzEpfjdXj4i9UfiShVwrnIHJ4wm KoQ3PH6GnvaqDoWs3t1J1Ggp6RL+O80FgcIkC97TXN4KrgadgsrU/9usszQVv7RvvlEg UybQ== X-Gm-Message-State: APjAAAXJ3lXWn0+6TFMK4hfEChUw2TV4xJg728oyWu2gh2/ESeXgFcL+ lAbKZpvO48sJINTJueHUC2bLjg== X-Google-Smtp-Source: APXvYqwGUpteiMBbJroh6e3iMOB61KaTfiz35EPYbeKnXKPQ3s5ZZDMqGyTbydMWyczXdzea6BfQsQ== X-Received: by 2002:a63:3196:: with SMTP id x144mr1625533pgx.284.1568769826815; Tue, 17 Sep 2019 18:23:46 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id w6sm9074032pfw.84.2019.09.17.18.23.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Sep 2019 18:23:46 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com Date: Wed, 18 Sep 2019 10:26:34 +0900 Message-Id: <20190918012643.25192-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190918012643.25192-1-takahiro.akashi@linaro.org> References: <20190918012643.25192-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC 06/15] secure boot: rename CONFIG_SECURE_BOOT 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The configuration, CONFIG_SECURE_BOOT, was scattered among different architecture directories for different implementation. This will prevent UEFI secure boot from being added later. So let's rename them, giving each implementation to different configuration option. CONFIG_SECURE_BOOT still remains not to break existing implicit dependency. Signed-off-by: AKASHI Takahiro --- Kconfig | 7 +++++++ arch/arm/cpu/armv7/ls102xa/Kconfig | 3 ++- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 ++- arch/arm/mach-imx/Kconfig | 3 ++- arch/powerpc/cpu/mpc85xx/Kconfig | 3 ++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Kconfig b/Kconfig index 1f0904f7045e..c11fc102a7d4 100644 --- a/Kconfig +++ b/Kconfig @@ -282,6 +282,13 @@ config SYS_LDSCRIPT endmenu # General setup +config SECURE_BOOT + bool "Secure Boot" + imply SHA256 + help + Enable Secure Boot feature. The actual behavior may vary + from architecture to architecture. + menu "Boot images" config ANDROID_BOOT_IMAGE diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 94fa68250ddf..ce1bc580d23d 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -50,8 +50,9 @@ config MAX_CPUS cores, count the reserved ports. This will allocate enough memory in spin table to properly handle all cores. -config SECURE_BOOT +config FSL_ARMV7_ENABLE_SECURE_BOOT bool "Secure Boot" + depends on SECURE_BOOT help Enable Freescale Secure Boot feature. Normally selected by defconfig. If unsure, do not change. diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 42d31fdab0a0..d4cfe31f8ebf 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -383,8 +383,9 @@ config EMC2305 Enable the EMC2305 fan controller for configuration of fan speed. -config SECURE_BOOT +config FSI_ARMV8_ENABLE_SECURE_BOOT bool "Secure Boot" + depends on SECURE_BOOT help Enable Freescale Secure Boot feature diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index aeb54934888d..e1602fd5f0e8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -34,8 +34,9 @@ config USE_IMXIMG_PLUGIN i.MX6/7 supports DCD and Plugin. Enable this configuration to use Plugin, otherwise DCD will be used. -config SECURE_BOOT +config FSL_IMX_ENABLE_SECURE_BOOT bool "Support i.MX HAB features" + depends on SECURE_BOOT depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 select FSL_CAAM if HAS_CAAM imply CMD_DEKBLOB diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index c038a6ddb0f4..9cf6ebbfe3ce 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -1208,8 +1208,9 @@ config FSL_LAW help Use Freescale common code for Local Access Window -config SECURE_BOOT +config FSL_MPC_ENABLE_SECURE_BOOT bool "Secure Boot" + depends on SECURE_BOOT help Enable Freescale Secure Boot feature. Normally selected by defconfig. If unsure, do not change.