Convert CONFIG_SYS_MMC_MAX_DEVICE to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_MMC_MAX_DEVICE

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/api/Kconfig b/api/Kconfig
index 382aa4ad3f02cb82aa777216854cb3d9cdf78925..eb8d5d0596a79498cf562a639c3008010142a413 100644 (file)
--- a/api/Kconfig
+++ b/api/Kconfig
@@ -5,4 +5,9 @@ config API
        help
          This option enables the U-Boot API. See api/README for more information.
 
+config SYS_MMC_MAX_DEVICE
+       int  "Maximum number of MMC devices exposed via the API"
+       depends on API
+       default 1
+
 endmenu

diff --git a/api/api_storage.c b/api/api_storage.c
index adca44b4fd22cd08bf510741d84aa67758ccf8c2..997e8727a9650f763517fe3e0650a6186d21d13b 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -44,10 +44,6 @@ struct stor_spec {
 
 static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
 
-#ifndef CONFIG_SYS_MMC_MAX_DEVICE
-#define CONFIG_SYS_MMC_MAX_DEVICE      1
-#endif
-
 void dev_stor_init(void)
 {
 #if defined(CONFIG_IDE)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index bd7e2f1bf5033cd2b2f9998766455f86f9448cef..8eefaf24b28d73d5299b07eef48bcaa5c07e6704 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -192,24 +192,6 @@
        DFU_ALT_INFO_NAND
 #endif
 
-/*
- * Default to using SPI for environment, etc.
- * 0x000000 - 0x020000 : SPL (128KiB)
- * 0x020000 - 0x0A0000 : U-Boot (512KiB)
- * 0x0A0000 - 0x0BFFFF : First copy of U-Boot Environment (128KiB)
- * 0x0C0000 - 0x0DFFFF : Second copy of U-Boot Environment (128KiB)
- * 0x0E0000 - 0x442000 : Linux Kernel
- * 0x442000 - 0x800000 : Userland
- */
-#if defined(CONFIG_SPI_BOOT)
-/* SPL related */
-#elif defined(CONFIG_EMMC_BOOT)
-#define CONFIG_SYS_MMC_MAX_DEVICE      2
-#endif
-
-/* Network. */
-/* Enable Atheros phy driver */
-
 /*
  * NOR Size = 16 MiB
  * Number of Sectors/Blocks = 128

diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h
index 222e69c20c01bf7d3559f5dc53dc0d91c9b6d72a..07a5bfc8a86e627e764ccacdc7063096ae534bab 100644 (file)
--- a/include/configs/stm32mp13_common.h
+++ b/include/configs/stm32mp13_common.h
@@ -21,9 +21,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           SZ_256M
 
-/*MMC SD*/
-#define CONFIG_SYS_MMC_MAX_DEVICE      2
-
 /* NAND support */
 
 /*****************************************************************************/

diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index 6103c2cea7f8ba83cf9803e272eecff8af5f450d..b809f9322ad2b53c18a52b248a03d574726584c6 100644 (file)
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -21,9 +21,6 @@
  */
 #define CONFIG_SYS_BOOTMAPSZ           SZ_256M
 
-/*MMC SD*/
-#define CONFIG_SYS_MMC_MAX_DEVICE      3
-
 /* NAND support */
 
 /* Ethernet need */

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index f9c701b90bb72b30d9cccacf7c6c4803677bd533..89501cacd933c2d4e15162a842469bdf5c7766e6 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -78,8 +78,6 @@
 /* mmc config */
 #define CONFIG_MMC_SUNXI_SLOT          0
 
-#define CONFIG_SYS_MMC_MAX_DEVICE      4
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 159ba093f2999615fede1926a7c709d12d7ee015..2915db7f8bf71ffa18795af8164afdd78b518ce2 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -28,13 +28,6 @@
  */
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 
-/*
- * Common HW configuration.
- * If this varies between SoCs later, move to tegraNN-common.h
- * Note: This is number of devices, not max device ID.
- */
-#define CONFIG_SYS_MMC_MAX_DEVICE 4
-
 #ifdef CONFIG_ARM64
 #define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
 #else

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e194e77e5b773af8a423d30fee0d91fe17e2831e..6574cf92e26ee1e5fa4c2465e4025952f1bae7bb 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -195,9 +195,6 @@
 
 /* Extend size of kernel image for uncompression */
 
-/* Boot FreeBSD/vxWorks from an ELF image */
-#define CONFIG_SYS_MMC_MAX_DEVICE      1
-
 /* Address in RAM where the parameters must be copied by SPL. */
 
 /* Not using MMC raw mode - just for compilation purpose */