From 7b6baa331454391185eeb727cdbcdf9f6d8df080 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 10 Sep 2020 20:21:15 -0600
Subject: [PATCH] Kconfig: Move boot media under boot options

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 826a9d5ba6..46f2dbffa8 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 393732083b..4c99239dfb 100644
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -628,4 +628,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