Convert CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/README b/README
index 51dc5718b546fee7e13054a1b3a5864863d7838c..d4bf74ce75d7aee50d360aa2f18553f04fcfb7b3 100644 (file)
--- a/README
+++ b/README
@@ -2249,10 +2249,6 @@ The following options need to be configured:
                parameters from when MMC is being used in raw mode
                (for falcon mode)
 
-               CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
-               Partition on the MMC to load U-Boot from when the MMC is being
-               used in fs mode
-
                CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
                Filename to read to load U-Boot when reading from filesystem
 

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index dcc1a95139fa260aeb3b96eb58b0acf713298c6e..72c7165dc2403c0cf10a1af54f4efbd61fb62447 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -680,6 +680,13 @@ config SPL_MMC_SUPPORT
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 
+config SYS_MMCSD_FS_BOOT_PARTITION
+       int "MMC Boot Partition"
+       default 1
+       help
+         Partition on the MMC to load U-Boot from when the MMC is being
+          used in fs mode
+
 config SPL_MMC_TINY
        bool "Tiny MMC framework in SPL"
        depends on SPL_MMC_SUPPORT

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index e331cce908adafa087e0bd881f4b00c56baf4bc0..aa20a7d8f23e96296a9758201885f77830b9f2de 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -207,7 +207,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 /* NAND boot config */

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index f71ae11f5159d64e5a281e2e09acfbaeffd95037..a9c14a1ce28ba2fc5b668d79a1317347ce891320 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -169,7 +169,6 @@
 
 /* Defines for SPL */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index e20cb5e332730a8555aaacb6d4a36bcff5f0b346..b4aaf5995fb54c36a7813ee7b1d343eaf7e816e3 100644 (file)
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -101,7 +101,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x70080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x00080000
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #elif CONFIG_NAND_BOOT

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 7fb8aa3246b46f6b3b83dd388dca32050f13e780..2ee07bafdddad8bbcbcb4e180099cd391f8df9c6 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_MCKR_CSS            0x1302
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 1889450f3ff5c051c236b93d653c7c3ac85493fe..6a95b39cdb7907ac8539266269f7ee44726ed6a4 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -107,7 +107,6 @@
 #define CONFIG_SYS_MCKR_CSS            0x1302
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 6d53f922b7948e1b682bf854dc77117ef4af7df3..a08fd6352f6665b43692cd653105139dc8a777ff 100644 (file)
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -19,7 +19,6 @@
 #endif
 
 #ifdef CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.itb"
 #endif
 #endif

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 629e0e19d5572e5f861a3c4567d2d76105c8600a..cd5538df7c6cb4809876823892dcc117822d3d8d 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (1024 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR                0x800
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             0
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_STACK               0x013E000

diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index a223930240c831e87d6fdd213038f88e57824c8c..ede81cca1f2e7a85ad7873bef4dd75563febfb60 100644 (file)
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -55,7 +55,6 @@
 
 /* MMC support */
 #if defined(CONFIG_SPL_MMC_SUPPORT)
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_MONITOR_LEN                 409600  /* 400 KB */
 #endif
 

diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h
index 7ef7017f51c7f2124363c33b39a05a30fadd2ac3..abf3dd57c847baa8ae8f4c8fbc71c06267e6e08e 100644 (file)
--- a/include/configs/imx7_spl.h
+++ b/include/configs/imx7_spl.h
@@ -32,7 +32,6 @@
 
 /* MMC support */
 #if defined(CONFIG_SPL_MMC_SUPPORT)
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_MONITOR_LEN                 409600  /* 400 KB */
 #endif
 

diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 0b4db97bd622b2e1c667314a8d7543703b093de2..9aef3d743eb304eee5f362d2239cd0d15f3d29ff 100644 (file)
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_MONITOR_LEN SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 1808f4ff85c140d2779b71c8f15f1ac373ead125..b37788ed1efa7a2e3dd05162c8b81c6a2e0341cc 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_MONITOR_LEN         SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 

diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 0b1025b9adfc264e5857e42a2df5cce27043a3ce..6e8a1db26ce8b8baf6814af6bcdf4749dda6806e 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_MONITOR_LEN         SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 453f49877a76dac32e13fe529dc31ed9801fecd5..82bd61f919bf0bed7544b2eb35c47b1e128cbb0d 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_UBOOT_BASE  (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 50793d34406b464106c06f605e721e2aec6c4af1..bb5dbe3c0dfffe3b81bb8bcb5764c595ecda6368 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index aa2e2cc806567fbb0dbf5a1eb2870dffba699c24..ee024bca5c5ff93c85a64df56bb726621aefdec6 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index ccc8fc01ecf1f509fa33b172a30f845b1fc06c9f..5fcc9be0a126373f5cf97a03a8cbc52fd5ccb7e0 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_MONITOR_LEN                         (1024 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR                0x800
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             0
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_STACK               0x013E000

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 8a3d84226872885a02aaa9fff4d1abbb788f2086..67df1998cbdc5fdf405f109186f9ec556d348f73 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_MONITOR_LEN                         (1024 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR                0x800
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             0
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_STACK               0x013E000

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index 58fa2162a811e9f5db21aaba961abd4506e7b6ec..4c02d8d375a8200f325aad14ed5211e8a093c58d 100644 (file)
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -16,7 +16,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_SBC_PHYCORE_AM335X
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index af4e61eab533df6ddc06ad4f7a2d866910447c62..85807ff3b69c88c2643954d2a4ddeefa603f0f23 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/

diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 3eb70d5e7821a6af53a2f268d135dd765c7bb84c..77b7ce411f5b47e26a131291dd0fa929c84ffeb6 100644 (file)
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -106,7 +106,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x00080000
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #define CONFIG_SPL_ATMEL_SIZE

diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 47274a51506aab24fb3ffa1159813ee8b3d38029..452fbda0668d321cc1a003853293bdb6033b0b27 100644 (file)
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -92,7 +92,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x70080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x00080000
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #elif CONFIG_NAND_BOOT

diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 8f1d508b8ce2b38f90bb8d60dcc300e15a94326d..7c064a0704b70393f3092b387b461e1a4d1af26e 100644 (file)
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -26,7 +26,6 @@
 
 /* RAW SD card / eMMC locations. */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0x60000000
 #define SDRAM_MAX_SIZE                 0x80000000
 

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 910fe58822514f71d4e07cc3f9af18175fe8f3b3..addad7a16ddf2c0aaafdc71d786acab5f9e44a8e 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -31,7 +31,6 @@
 /* RAW SD card / eMMC locations. */
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #define CONFIG_SYS_SDRAM_BASE          0

diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 407e5d2931182ca6ef8eee0170cea683bcbd22fd..0538da751f2385cd549b5b3a7ab858dcf48b7104 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0
 #define SDRAM_MAX_SIZE                 0xff000000
 

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 4121d5edc46c61217ec5dce4ab6b7b431dec0af3..d0fc598319a9b84d24d9a985b37f50871be70aaf 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -40,7 +40,6 @@
 /* RAW SD card / eMMC locations. */
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0
 #define SDRAM_MAX_SIZE                 0xf8000000
 

diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h
index 4d66490cd68f082bd530a772f5f92550b97889c3..3358149e662dc73c45c065cb12f2b8efc372b2a5 100644 (file)
--- a/include/configs/sama5d27_som1_ek.h
+++ b/include/configs/sama5d27_som1_ek.h
@@ -49,7 +49,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 

diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h
index 6bcbc0602088594e0d86c1cae31191c3bdcda1c4..8bea764582153e06e516cb7de443e53b14ca0899 100644 (file)
--- a/include/configs/sama5d27_wlsom1_ek.h
+++ b/include/configs/sama5d27_wlsom1_ek.h
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 

diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h
index 7d6886ea73e10fae2d5ec2412671705544f75563..9be6d4f3381c6ffafe258efec0d21e2c4daec137 100644 (file)
--- a/include/configs/sama5d2_icp.h
+++ b/include/configs/sama5d2_icp.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 487339594ec45290273d9780f2b494b51c29ec4a..4f5ceca780a751404df250889800bcf538c89416 100644 (file)
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -67,7 +67,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 65156c947f40563d328e7faa45a146c42627a113..1113214bcff5d3cfc82ccda57020b911c7c2ccdc 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -69,7 +69,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (2 * SZ_512K)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 4185826e37e88d6a5f08db67705ac3d547973776..44c1952b51e710001d1b004d3aaf6c5f1ee5bcc8 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -81,7 +81,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index d00be5a44573f9d71a1ecca797c363112cb6eb22..80809df638a5d8ad891a240cf1de34c8f197a75c 100644 (file)
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 33718d4eac8b88760abee5b23b655d81f0fff9f2..2fb4764f7ce5984f924dc30acb7740c2aae10f8f 100644 (file)
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index cefc457d222fc6cd363df7c75fb3b8aca9acac4d..e18af7493c7f4a02f0b4e8736571a62982e7f7a5 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -83,7 +83,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 #define CONFIG_SYS_NAND_ONFI_DETECTION

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 62e1405d1c316b407fec61103f4c0a787a82c1da..4747e74b6815d1363aaa7a0942bc9ca2c10a2ce1 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -72,7 +72,6 @@
 #define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
 #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                        "u-boot.img"
 
 #define CONFIG_SYS_CBSIZE      512

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 07c9745eba92b1e20fb490cf5b0852c478e53a81..fe68e4392e27fdb201a41e3ea3fc609fd7a4ae80 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -191,7 +191,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #endif
 #else
 #ifndef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 775a122f1f12ea9d6afa76c856f639a23b87e780..3e6c726710802b899ac39c2526bb2ccf2cf31a07 100644 (file)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -194,7 +194,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
                                        - CONFIG_SYS_SPL_MALLOC_SIZE)
 
 /* SPL SDMMC boot support */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 #endif /* __CONFIG_SOCFPGA_SOC64_COMMON_H__ */

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index dc89df882660ab7ea1d97602dd3f1f265cc834dd..afc9adbe127e45b7be916654c541db01eb2d72c9 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -133,7 +133,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x8f080000 /* end of RAM */
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 
 /* FAT */

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 5a461c50b94cf7a632cd1de5229a89e8a7e3066a..2954baf165c85dda6e95469eb50825b6038ff124 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -183,7 +183,6 @@
 
 /* Defines for SPL */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 /* NAND boot config */

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 6f8072067b799176367686abf3cbe6efa02485b4..67bcc0c21829eb9245dd4a375c2d784603c7db4a 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -120,7 +120,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
 
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 #define CONFIG_SYS_SPI_U_BOOT_SIZE     0x40000

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 4769a398c532eb85e839355c2d2821eeeeab5fe9..0c9856a11a370f613df7a5ee362dac131e5991c9 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -161,7 +161,6 @@
 
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 #endif

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index e7d57bb90082c9cd3545b98b552dec2300adf414..02f57281afde298da28c69608971845ff8f6d341 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -204,7 +204,6 @@
 /* Defines for SPL */
 
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
                                         CONFIG_SPL_TEXT_BASE)

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 3f1a145d094c778c31cc25ced42b72f7f87707d7..25fa7937df83a954c318fdf20402a016bffdc916 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_MONITOR_LEN         SZ_512K
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index e7cfebee7c469adb562d6223bbbd3a3e4234add3..58b463c9f47cf3d8c57e83535df385a7fe82955b 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -232,7 +232,6 @@
 
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
-# define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION    1
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS        0 /* unused */
 # define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR       0 /* unused */

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 246f7d138c198bbdb4228a62e870eb658e47d937..d05bdc4fb73f2b185d55c4845cf8315e62f310a9 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -229,7 +229,6 @@
 
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
 #endif
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 82de978f30df89885fc87b2847651684d626ea49..13096829e027b4f4775cad05863dfcff2e49c5a3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2980,7 +2980,6 @@ CONFIG_SYS_MFD
 CONFIG_SYS_MHZ
 CONFIG_SYS_MII_MODE
 CONFIG_SYS_MIPS_TIMER_FREQ
-CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR