From patchwork Fri Sep 11 02:21:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1362184 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=STZRTQSw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bnffs69Dwz9sR4 for ; Fri, 11 Sep 2020 12:22:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D1A3682316; Fri, 11 Sep 2020 04:21:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="STZRTQSw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE73682311; Fri, 11 Sep 2020 04:21:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B42FF822AF for ; Fri, 11 Sep 2020 04:21:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd44.google.com with SMTP id y13so9467247iow.4 for ; Thu, 10 Sep 2020 19:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wgtLjlKHE3XMySPO+MmI35DPMnH5oRNWJDz8858Tb1A=; b=STZRTQSwhyehOB00mm1IjFUdLpVgOefmvjnv28WLUlHlmFjINmUXdQ0VKg7LSI7u0v rTw+U/6INNDlMNoxZ+eHmycUH2KiWiBlhgcW/wG0D2Y3qCnAfkFIdBtGfrfrQyJsCELl OKmGfH5pyrYH3ixsRr3J2t/BEUusL7hnQzaGc= 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=wgtLjlKHE3XMySPO+MmI35DPMnH5oRNWJDz8858Tb1A=; b=DcW6qFpmdOvn1OkUCo7DP62mkz7PA8pDY0l8n5mkWfAFgqOSaRC4rP+3Tl1Ggr6Yu3 3FmvdUe2yqwS3DlJ/BxooOrNjgeHyf+yxr+OYcs3ZR7mirOJCw8UDn9GI30IvNNqum0X sORSbbukRhYmwsZjaSg6n2EkDoD0NBdtqTopw0iAuJYVp0NoA4atzn8exqzroeSi9jaT GzkJ61S6iKt+gACigTUoO6NzxHjd/IbDd7Ey0jrLtebPSAdm2cnhmqi2GkcZfBXzpgBx Q3Ip28kTji6Quszq8ILcG8+LPGoekON7Mte3s/dXIUf9UY1sMb5EHvMbHL4ozVs2oyge R2oA== X-Gm-Message-State: AOAM533GzEJMyKbZrgNjPd0Cj91ljVpW1uNqqf0lnQTqQvZY9kMS16mr MXECfyYDkJK6VcpYzQfE0Vgx/+h11hlroXOS X-Google-Smtp-Source: ABdhPJz8fT0oeSHeEGVifUNbZNoYRPzc3Ycvm3dwq9uOBJUGtss5kUdHPMFIlUT5AaMGs8I76YQE/A== X-Received: by 2002:a5e:8d04:: with SMTP id m4mr26790ioj.107.1599790898434; Thu, 10 Sep 2020 19:21:38 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id m7sm440078ili.26.2020.09.10.19.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 19:21:37 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Masahiro Yamada , Marek Vasut , Tom Rini , Simon Glass , Heinrich Schuchardt , Jagan Teki , Kever Yang , Usama Arif Subject: [PATCH 04/16] Kconfig: Move boot media under boot options Date: Thu, 10 Sep 2020 20:21:15 -0600 Message-Id: <20200910202100.4.Ibc9e3ab7a6925f9a216294c42b754995e1674e00@changeid> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog In-Reply-To: <20200911022127.3451713-1-sjg@chromium.org> References: <20200911022127.3451713-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This relates to booting, so move it under the boot menu. Signed-off-by: Simon Glass --- common/Kconfig | 63 --------------------------------------------- common/Kconfig.boot | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 58363b901a2..a350b66c4d0 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,68 +1,5 @@ source "common/Kconfig.boot" -menu "Boot media" - -config NOR_BOOT - bool "Support for booting from NOR flash" - depends on NOR - help - Enabling this will make a U-Boot binary that is capable of being - booted via NOR. In this case we will enable certain pinmux early - as the ROM only partially sets up pinmux. We also default to using - NOR for environment. - -config NAND_BOOT - bool "Support for booting from NAND flash" - default n - imply MTD_RAW_NAND - help - Enabling this will make a U-Boot binary that is capable of being - booted via NAND flash. This is not a must, some SoCs need this, - some not. - -config ONENAND_BOOT - bool "Support for booting from ONENAND" - default n - imply MTD_RAW_NAND - help - Enabling this will make a U-Boot binary that is capable of being - booted via ONENAND. This is not a must, some SoCs need this, - some not. - -config QSPI_BOOT - bool "Support for booting from QSPI flash" - default n - help - Enabling this will make a U-Boot binary that is capable of being - booted via QSPI flash. This is not a must, some SoCs need this, - some not. - -config SATA_BOOT - bool "Support for booting from SATA" - default n - help - Enabling this will make a U-Boot binary that is capable of being - booted via SATA. This is not a must, some SoCs need this, - some not. - -config SD_BOOT - bool "Support for booting from SD/EMMC" - default n - help - Enabling this will make a U-Boot binary that is capable of being - booted via SD/EMMC. This is not a must, some SoCs need this, - some not. - -config SPI_BOOT - bool "Support for booting from SPI flash" - default n - help - Enabling this will make a U-Boot binary that is capable of being - booted via SPI flash. This is not a must, some SoCs need this, - some not. - -endmenu - config BOOTDELAY int "delay in seconds before automatically booting" default 2 diff --git a/common/Kconfig.boot b/common/Kconfig.boot index eb85045255a..f356f7f39d9 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -629,4 +629,67 @@ config SHOW_BOOT_PROGRESS endmenu +menu "Boot media" + +config NOR_BOOT + bool "Support for booting from NOR flash" + depends on NOR + help + Enabling this will make a U-Boot binary that is capable of being + booted via NOR. In this case we will enable certain pinmux early + as the ROM only partially sets up pinmux. We also default to using + NOR for environment. + +config NAND_BOOT + bool "Support for booting from NAND flash" + default n + imply MTD_RAW_NAND + help + Enabling this will make a U-Boot binary that is capable of being + booted via NAND flash. This is not a must, some SoCs need this, + some not. + +config ONENAND_BOOT + bool "Support for booting from ONENAND" + default n + imply MTD_RAW_NAND + help + Enabling this will make a U-Boot binary that is capable of being + booted via ONENAND. This is not a must, some SoCs need this, + some not. + +config QSPI_BOOT + bool "Support for booting from QSPI flash" + default n + help + Enabling this will make a U-Boot binary that is capable of being + booted via QSPI flash. This is not a must, some SoCs need this, + some not. + +config SATA_BOOT + bool "Support for booting from SATA" + default n + help + Enabling this will make a U-Boot binary that is capable of being + booted via SATA. This is not a must, some SoCs need this, + some not. + +config SD_BOOT + bool "Support for booting from SD/EMMC" + default n + help + Enabling this will make a U-Boot binary that is capable of being + booted via SD/EMMC. This is not a must, some SoCs need this, + some not. + +config SPI_BOOT + bool "Support for booting from SPI flash" + default n + help + Enabling this will make a U-Boot binary that is capable of being + booted via SPI flash. This is not a must, some SoCs need this, + some not. + +endmenu + endmenu # Booting