All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH 04/16] Kconfig: Move boot media under boot options
Date: Thu, 10 Sep 2020 20:21:15 -0600	[thread overview]
Message-ID: <20200910202100.4.Ibc9e3ab7a6925f9a216294c42b754995e1674e00@changeid> (raw)
In-Reply-To: <20200911022127.3451713-1-sjg@chromium.org>

This relates to booting, so move it under the boot menu.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 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
-- 
2.28.0.618.gf4bc123cb7-goog

  parent reply	other threads:[~2020-09-11  2:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-11  2:21 [PATCH 00/16] Kconfig: Tidy up the top-level kconfig menu Simon Glass
2020-09-11  2:21 ` [PATCH 01/16] Kconfig: Add a 'Boot options' menu Simon Glass
2020-09-11  2:21 ` [PATCH 02/16] Kconfig: Move boot menu into common/ Simon Glass
2020-09-11  2:21 ` [PATCH 03/16] Kconfig: Move boot timing under boot options Simon Glass
2020-09-11  2:21 ` Simon Glass [this message]
2020-09-11  2:21 ` [PATCH 05/16] Kconfig: Move autoboot options " Simon Glass
2020-09-11  2:21 ` [PATCH 06/16] Kconfig: Move CONFIG_BOOTDELAY under autoboot options Simon Glass
2020-09-11  2:21 ` [PATCH 07/16] Kconfig: Move misc boot options under 'boot options' Simon Glass
2020-09-11  2:21 ` [PATCH 08/16] Kconfig: Move SUPPORT_RAW_INITRD under boot options Simon Glass
2020-09-11  2:21 ` [PATCH 09/16] Kconfig: Move DEFAULT_FDT_FILE " Simon Glass
2020-09-11  2:21 ` [PATCH 10/16] Kconfig: Create a new 'init options' menu Simon Glass
2020-09-11  2:21 ` [PATCH 11/16] Kconfig: Move startup hooks under init options Simon Glass
2020-09-11  2:21 ` [PATCH 12/16] Kconfig: MISC_INIT_R and BOARD_LATE_INIT -> start-up hooks Simon Glass
2020-09-11  2:21 ` [PATCH 13/16] Kconfig: Move VERSION_VARIABLE under environment Simon Glass
2020-09-11  2:21 ` [PATCH 14/16] Kconfig: Move BOUNCE_BUFFER under driver options Simon Glass
2020-09-11  2:21 ` [PATCH 15/16] Kconfig: Move BOARD_TYPES under init options Simon Glass
2020-09-11  2:21 ` [PATCH 16/16] Kconfig: Create a new tools menu Simon Glass
2020-09-11 16:11 ` [PATCH 00/16] Kconfig: Tidy up the top-level kconfig menu Tom Rini
2020-09-11 20:15   ` Simon Glass
2020-09-11 20:20     ` Tom Rini
2020-10-09 22:11 ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200910202100.4.Ibc9e3ab7a6925f9a216294c42b754995e1674e00@changeid \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.