From acc415ac60d1741a3b1496ab1d3e58232bac6174 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Fri, 3 Jul 2020 10:17:30 -0500 Subject: [PATCH] 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 --- README | 4 ---- common/spl/Kconfig | 7 +++++++ include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/ax25-ae350.h | 1 - include/configs/capricorn-common.h | 1 - include/configs/imx6_spl.h | 1 - include/configs/imx7_spl.h | 1 - include/configs/imx8mm_beacon.h | 1 - include/configs/imx8mm_evk.h | 1 - include/configs/imx8mn_evk.h | 1 - include/configs/imx8mp_evk.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/imx8mq_phanbell.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/phycore_am335x_r2.h | 1 - include/configs/pico-imx8mq.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/pm9g45.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/sama5d27_som1_ek.h | 1 - include/configs/sama5d27_wlsom1_ek.h | 1 - include/configs/sama5d2_icp.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/socfpga_soc64_common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 1 - include/configs/verdin-imx8mm.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - scripts/config_whitelist.txt | 1 - 48 files changed, 7 insertions(+), 50 deletions(-) diff --git a/README b/README index 51dc5718b5..d4bf74ce75 100644 --- 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 dcc1a95139..72c7165dc2 100644 --- 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 e331cce908..aa20a7d8f2 100644 --- 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 f71ae11f51..a9c14a1ce2 100644 --- 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 e20cb5e332..b4aaf5995f 100644 --- 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 7fb8aa3246..2ee07bafdd 100644 --- 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 1889450f3f..6a95b39cdb 100644 --- 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 6d53f922b7..a08fd6352f 100644 --- 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 629e0e19d5..cd5538df7c 100644 --- 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 a223930240..ede81cca1f 100644 --- 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 7ef7017f51..abf3dd57c8 100644 --- 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 0b4db97bd6..9aef3d743e 100644 --- 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 1808f4ff85..b37788ed1e 100644 --- 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 0b1025b9ad..6e8a1db26c 100644 --- 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 453f49877a..82bd61f919 100644 --- 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 50793d3440..bb5dbe3c0d 100644 --- 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 aa2e2cc806..ee024bca5c 100644 --- 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 ccc8fc01ec..5fcc9be0a1 100644 --- 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 8a3d842268..67df1998cb 100644 --- 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 58fa2162a8..4c02d8d375 100644 --- 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 af4e61eab5..85807ff3b6 100644 --- 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 3eb70d5e78..77b7ce411f 100644 --- 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 47274a5150..452fbda066 100644 --- 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 8f1d508b8c..7c064a0704 100644 --- 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 910fe58822..addad7a16d 100644 --- 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 407e5d2931..0538da751f 100644 --- 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 4121d5edc4..d0fc598319 100644 --- 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 4d66490cd6..3358149e66 100644 --- 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 6bcbc06020..8bea764582 100644 --- 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 7d6886ea73..9be6d4f338 100644 --- 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 487339594e..4f5ceca780 100644 --- 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 65156c947f..1113214bcf 100644 --- 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 4185826e37..44c1952b51 100644 --- 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 d00be5a445..80809df638 100644 --- 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 33718d4eac..2fb4764f7c 100644 --- 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 cefc457d22..e18af7493c 100644 --- 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 62e1405d1c..4747e74b68 100644 --- 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 07c9745eba..fe68e4392e 100644 --- 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 775a122f1f..3e6c726710 100644 --- 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 dc89df8826..afc9adbe12 100644 --- 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 5a461c50b9..2954baf165 100644 --- 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 6f8072067b..67bcc0c218 100644 --- 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 4769a398c5..0c9856a11a 100644 --- 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 e7d57bb900..02f57281af 100644 --- 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 3f1a145d09..25fa7937df 100644 --- 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 e7cfebee7c..58b463c9f4 100644 --- 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 246f7d138c..d05bdc4fb7 100644 --- 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 82de978f30..13096829e0 100644 --- 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 -- 2.39.5