env: Rename SYS_MMC_ENV_PART to ENV_MMC_EMMC_HW_PARTITION

Rename the variable and add ENV_ prefix, so that all configuration
options which are related to environment would have an CONFIG_ENV_
prefix. No functional change.

Use ENV_MMC_EMMC_HW_PARTITION to clarify this is the eMMC hardware
partition selector, not a software partition table entry selector.
Retain the ENV_MMC_ prefix to make it easier to search for all the
SD/MMC related ENV options. Update the help text accordingly.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index 90fe9e7c19b1dac1886ff1a225ed57be65a1d1e6..50521490b354ddb8fb0d67588aa0f8d87e8a7a03 100644 (file)
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -540,10 +540,10 @@ int mmc_get_env_dev(void)
        return board_mmc_get_env_dev(devno);
 }
 
-#ifdef CONFIG_SYS_MMC_ENV_PART
+#ifdef CONFIG_ENV_MMC_EMMC_HW_PARTITION
 __weak int board_mmc_get_env_part(int devno)
 {
-       return CONFIG_SYS_MMC_ENV_PART;
+       return CONFIG_ENV_MMC_EMMC_HW_PARTITION;
 }
 
 uint mmc_get_env_part(struct mmc *mmc)
@@ -552,7 +552,7 @@ uint mmc_get_env_part(struct mmc *mmc)
 
        /* If not boot from sd/mmc, use default value */
        if (devno < 0)
-               return CONFIG_SYS_MMC_ENV_PART;
+               return CONFIG_ENV_MMC_EMMC_HW_PARTITION;
 
        return board_mmc_get_env_part(devno);
 }

diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index 4887bf7b181c8de766c071f1eea58c05e3dbe1a6..32c8e9bd39fbedd31e117096ed41b40c8ff17d17 100644 (file)
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -58,7 +58,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=1
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10

diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index fdee4d0bf07cc10fbabd7841b7fef3b99f2cd62f..86fa5d30373b6618a96263b7e48cef2d1b90ef61 100644 (file)
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -74,7 +74,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y

diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index 3872e8cd9b052fa955245e52cc00ef1cae2c9f2f..dfd586b1c1448f565e5f0b49202801f08f8e301c 100644 (file)
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -50,7 +50,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 539060c5282427fe3118ef66adefb21814bfa036..de30fa1b961c7df5e731f856d79fd69f30089135 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_TSIZE=y

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index fd08432e57a7978386be8c182784ec494be2ede0..7d54205938e093b5778172d445128d97db390cd4 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -70,7 +70,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 9937344cb6f9c7892a8464f6cc624f0f0ffecc7b..e9c9cfe940e42663f59e192b4ccea245bdd4e704 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 56f0362e201b89dd74ce776da1253b7193cc876a..caf2ae196f8c9d7ce6746e6111911876d27a0c69 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -44,7 +44,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 2bdd0f9c40b13a1f348809b121a381ca0d31fa1a..58da63d11dd13a1397963ba0e03aa6db00c813e7 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -82,7 +82,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=1
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index fdb7b8b5db25e3cbb7c10d689a7ed9d4769c367c..2af491b065de1a3db3a5a9ad92098feab56daa39 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -76,7 +76,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=1
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index ad220c19788ee160ac341dbb5fd277815312f29c..318fbaa529b649a10990b8996785220f7f453dae 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -41,7 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y

diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index f9965bba23e7cecde73e69e0483f9199d7097b1a..01c3117e364d387e8596776b286ec6355b680dbb 100644 (file)
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index 20469aa1973db0558a462d82a108256cbd6870f7..f1c6373c31e6e4085753a756736af59e367cfcb9 100644 (file)
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -48,7 +48,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index cf027bc1c755a3542f6ebf37d1def84d16785580..431987d3f90bbad5ab12c562655f6c6993abc596 100644 (file)
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -51,7 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 7ce17b0bad985164dd32d744e88209f09f152975..1aea1d40c4e644f6456077ef54763e0a9914fe33 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -69,7 +69,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index fa53b29eaace9f5f8ad681f4f349fb3c5f2aa42f..e23cc9935427311fac4db71dd8e9c44ba5997910 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -48,7 +48,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_USE_IPADDR=y

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 23ce3d9bbfd7aa6b22db50b0188338c48bc21756..8d7a6bf7060cdfa359b2b49eba829da08b39b6b0 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -44,7 +44,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_NET_RANDOM_ETHADDR=y

diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 0aed9ebad588ec8b5b8bca2cbbf0efb845a6a8cc..c44980e9227868a365de9ae80a0ad7a59ee04af3 100644 (file)
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index 20b2794b61861cb850a47626ad350301b4a9a62f..c01d22abe2bff2d605c514a1d3b2ef8c52966d88 100644 (file)
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -36,7 +36,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_SYSBOOT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON_QCOM_PMIC=y
 CONFIG_CLK=y
 CONFIG_CLK_QCOM_APQ8016=y

diff --git a/configs/e850-96_defconfig b/configs/e850-96_defconfig
index 34bfc75ea3149634bbffb2c0bf0aae237d867a58..e07e4cffd0aeb1c948f52f9e2bf3e1e3e05ae4e4 100644 (file)
--- a/configs/e850-96_defconfig
+++ b/configs/e850-96_defconfig
@@ -35,7 +35,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_NO_NET=y
 CONFIG_CLK_EXYNOS850=y
 CONFIG_SUPPORT_EMMC_BOOT=y

diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig
index 7aac11192fcf757310fe2f54e6032c41b402d252..804b00697a1e457ca34b7b409440d39bc8349fa9 100644 (file)
--- a/configs/endeavoru_defconfig
+++ b/configs/endeavoru_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/grouper_defconfig b/configs/grouper_defconfig
index 76ec9a39a7c600a52760c072358fdfe668136dda..b9068e18b03cc758bfb701eec438603978a735f4 100644 (file)
--- a/configs/grouper_defconfig
+++ b/configs/grouper_defconfig
@@ -55,7 +55,7 @@ CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 9aabd6be88a1e4e16b7871f8348a2a2f77701cd4..807e48f50e4d69ee31fa79ab950a343439b50e4c 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -93,7 +93,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NETCONSOLE=y
 CONFIG_USE_IPADDR=y

diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig
index 88ce24c65723e01c3b9d31a01cf1272801f92c4c..f5bb28cb0c778caf7b2fdb60e5b331d1d50de19b 100644 (file)
--- a/configs/hihope_rzg2_defconfig
+++ b/configs/hihope_rzg2_defconfig
@@ -25,7 +25,7 @@ CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=0
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_GPIO_HOG=y
 CONFIG_DM_PCA953X=y
 CONFIG_SYS_I2C_RCAR_I2C=y

diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index c63e66cf38345776da6d14f055151f33087a01e7..59c2101110ea4bbb9ae89617a6f4c1b5e9c77487 100644 (file)
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -29,7 +29,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y

diff --git a/configs/hmibsc_defconfig b/configs/hmibsc_defconfig
index 6832ed4607746b01c23e6df503cfdc642903d087..b45245729a73c07ed57f811842169bd12b7d17a7 100644 (file)
--- a/configs/hmibsc_defconfig
+++ b/configs/hmibsc_defconfig
@@ -43,7 +43,7 @@ CONFIG_CMD_FS_GENERIC=y
 # CONFIG_OF_UPSTREAM is not set
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_BUTTON_QCOM_PMIC=y

diff --git a/configs/ideapad-yoga-11_defconfig b/configs/ideapad-yoga-11_defconfig
index 350dbcc4dcd679d6eaf2b32d4b9f5c3d660f904b..d5befae419d6a3c995e163004c7a343014be686d 100644 (file)
--- a/configs/ideapad-yoga-11_defconfig
+++ b/configs/ideapad-yoga-11_defconfig
@@ -51,7 +51,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/imx6q_bosch_acc_defconfig b/configs/imx6q_bosch_acc_defconfig
index b6cbd9fbb661219965799205dd1bf0ab89edae68..6f0ef2eaee3686825584b5037435babf5ea59318 100644 (file)
--- a/configs/imx6q_bosch_acc_defconfig
+++ b/configs/imx6q_bosch_acc_defconfig
@@ -77,7 +77,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/imx8m_data_modul.config b/configs/imx8m_data_modul.config
index 0c9f85b76715edbea4cb92253997a13239193cfe..07390037c4609bb9419e704bfefdfe352ef8292d 100644 (file)
--- a/configs/imx8m_data_modul.config
+++ b/configs/imx8m_data_modul.config
@@ -198,7 +198,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_SYS_MONITOR_LEN=1048576
 CONFIG_SYS_PBSIZE=2081
 CONFIG_SYS_PROMPT="u-boot=> "

diff --git a/configs/imx8mm-mx8menlo_defconfig b/configs/imx8mm-mx8menlo_defconfig
index d7be3f0c679a1f08adeb30847f32238b27c3553d..eb8e90a125154fb91e548d8d7cb41fb8865c0bdd 100644 (file)
--- a/configs/imx8mm-mx8menlo_defconfig
+++ b/configs/imx8mm-mx8menlo_defconfig
@@ -93,7 +93,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig
index 52c9f0078928ca2e280a95800eb85b424450782d..06cc4bb7ddedeafa439522206672e201c972d286 100644 (file)
--- a/configs/imx8mm_beacon_defconfig
+++ b/configs/imx8mm_beacon_defconfig
@@ -76,7 +76,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mm_beacon_fspi_defconfig b/configs/imx8mm_beacon_fspi_defconfig
index 77db48da38fe41ba6b327e214a145780e8eba76c..5e60c9d3a086443fb30aec8b6eab49a9560de633 100644 (file)
--- a/configs/imx8mm_beacon_fspi_defconfig
+++ b/configs/imx8mm_beacon_fspi_defconfig
@@ -79,7 +79,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig
index 0fd446c6e36709aa5ac56824252cfb92ed61e028..b71cdbb2e4e96171c2f5fd131c82554af187edc3 100644 (file)
--- a/configs/imx8mn_beacon_2g_defconfig
+++ b/configs/imx8mn_beacon_2g_defconfig
@@ -84,7 +84,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig
index 860d1a9bd27fe72d1a2d7fa271010e6fb8071e65..bb483653db27c312349685bb34691e97394fb7a3 100644 (file)
--- a/configs/imx8mn_beacon_defconfig
+++ b/configs/imx8mn_beacon_defconfig
@@ -85,7 +85,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mn_beacon_fspi_defconfig b/configs/imx8mn_beacon_fspi_defconfig
index 4fb7cfded5134fdbcb7503a6a8b2d426d46024b9..f163871bfaab6cd68faf7e0e46ae6b3847ed8e25 100644 (file)
--- a/configs/imx8mn_beacon_fspi_defconfig
+++ b/configs/imx8mn_beacon_fspi_defconfig
@@ -84,7 +84,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mn_var_som_defconfig b/configs/imx8mn_var_som_defconfig
index 3b41cdddddfb4495d05116976ad3d1e32e56b414..26b2a3be64d35dff7c431f14c5920df91eb263e6 100644 (file)
--- a/configs/imx8mn_var_som_defconfig
+++ b/configs/imx8mn_var_som_defconfig
@@ -62,7 +62,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/imx8mp_beacon_defconfig b/configs/imx8mp_beacon_defconfig
index 51b547c448f273a7b70533a99905f0dfe1bd4949..1c2f7a8501a136037dec78050f42884f150a6d42 100644 (file)
--- a/configs/imx8mp_beacon_defconfig
+++ b/configs/imx8mp_beacon_defconfig
@@ -83,7 +83,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth1"
 CONFIG_SPL_DM=y

diff --git a/configs/imx8qxp_capricorn.config b/configs/imx8qxp_capricorn.config
index 7b034d5ff1ed2251fa28f3c5a9d1d9555dcc6f7f..62babf2626f7fde3bc5e26c07d3d67a162d1870b 100644 (file)
--- a/configs/imx8qxp_capricorn.config
+++ b/configs/imx8qxp_capricorn.config
@@ -11,7 +11,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_REDUNDANT=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 
 CONFIG_DM_GPIO=y
 CONFIG_AHAB_BOOT=y

diff --git a/configs/j722s_evm_r5_defconfig b/configs/j722s_evm_r5_defconfig
index ab0d4ebb8258859cefad8d08d79a32ae5b4d583b..f4562bd0d682482711605c77b4d9a95e5cc9a123 100644 (file)
--- a/configs/j722s_evm_r5_defconfig
+++ b/configs/j722s_evm_r5_defconfig
@@ -69,7 +69,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_NO_NET=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 9594c30dec60b1131167dd17c4b8650a60f26fb3..13d43c02b9f3e7e177f0a4ab66ba1a761f7e6d19 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig
index e763f564ad123655932299e8c890d7ea92a67f96..765a154c1509c8ba424eb25389ff45ffa39c926b 100644 (file)
--- a/configs/khadas-vim3_android_ab_defconfig
+++ b/configs/khadas-vim3_android_ab_defconfig
@@ -58,7 +58,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ADC=y
 CONFIG_SARADC_MESON=y
 CONFIG_BUTTON=y

diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig
index af34a379e8443779e92dd2c636c234873ff1c48a..d105c2b40b0b5c87d22d6c51f64d4449353947eb 100644 (file)
--- a/configs/khadas-vim3_android_defconfig
+++ b/configs/khadas-vim3_android_defconfig
@@ -57,7 +57,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ADC=y
 CONFIG_SARADC_MESON=y
 CONFIG_BUTTON=y

diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig
index c95cd2831d67478fcd71a7796dded8d6c697de5b..0625c101085adfd3ad7b117225f1a101493eba5a 100644 (file)
--- a/configs/khadas-vim3l_android_ab_defconfig
+++ b/configs/khadas-vim3l_android_ab_defconfig
@@ -58,7 +58,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ADC=y
 CONFIG_SARADC_MESON=y
 CONFIG_BUTTON=y

diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig
index d1141cd8cb9c301945a59512e2743d633be00e6f..be65d0feb12255a537c58e334eb51fed5f0816c9 100644 (file)
--- a/configs/khadas-vim3l_android_defconfig
+++ b/configs/khadas-vim3l_android_defconfig
@@ -57,7 +57,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ADC=y
 CONFIG_SARADC_MESON=y
 CONFIG_BUTTON=y

diff --git a/configs/mocha_defconfig b/configs/mocha_defconfig
index 8d352e495515b3e588eb9f01c476430fab895b45..ab8cea69a02dace9e7424fcfd2b80ada5e5f313a 100644 (file)
--- a/configs/mocha_defconfig
+++ b/configs/mocha_defconfig
@@ -54,7 +54,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/mot_defconfig b/configs/mot_defconfig
index 8f0a52d719f90e5741ed5bfe0c4fef5c9992ff12..c5004c250fb04d78c774cbee9a3395159b1066c7 100644 (file)
--- a/configs/mot_defconfig
+++ b/configs/mot_defconfig
@@ -53,7 +53,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x11000000

diff --git a/configs/mt8183_pumpkin_defconfig b/configs/mt8183_pumpkin_defconfig
index 9d0495f470cab009a5d1bdd623908de039e311f0..4aceb73c34c59a3f96f02036ffcd0de1af962488 100644 (file)
--- a/configs/mt8183_pumpkin_defconfig
+++ b/configs/mt8183_pumpkin_defconfig
@@ -55,7 +55,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DEVRES=y
 CONFIG_CLK=y

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 4294194ede654db4270c898c377f9f4e6be47a14..6d2b1a17edfa24bc576d165728eee079435a6933 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -57,7 +57,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index 0379b4bbfe9084a2dff580c2a1bf3efcc861430e..e9184549601727c273e0cbb4694fc82226c76c90 100644 (file)
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -75,7 +75,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_VERSION_VARIABLE=y
 CONFIG_USE_ROOTPATH=y
 CONFIG_ROOTPATH="/tftpboot/opos6ul-root"

diff --git a/configs/ouya_defconfig b/configs/ouya_defconfig
index d8f3f389b5e7f75609c54c0da8ec56783f215ba3..60cc3796c5e1643d7ca04d3d4e5458db00adacea 100644 (file)
--- a/configs/ouya_defconfig
+++ b/configs/ouya_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 422e3530e6403dc662088f72dd0f6a2f71d30ead..4d3bfaa69827cdbe8f879d5c76902c707baca5ce 100644 (file)
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -30,7 +30,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 1815b24a4b71c5acbc181fe81da8f00cf7ec1d52..fdbe87574d564f7399ae12d05231c612db2cddfc 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -38,7 +38,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index a8f804867912a095e6d2409f5751bd07693dbcc5..4fd72ffbbf4dec002925f978d554f9a2c2e67879 100644 (file)
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -31,7 +31,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index 21937a0decfabaf4a736c853f197fe2464775a6b..462bec3bae2a30c70ccc6ec69025f2fb6e974e27 100644 (file)
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -31,7 +31,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA186_BPMP_I2C=y
 CONFIG_DWC_ETH_QOS=y

diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index 4cd32e60a99831b414fa3107930bd166ec2cc90e..42043277e2dd550019a3469c82942afbf7b9ae9d 100644 (file)
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -30,7 +30,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA186_BPMP_I2C=y
 CONFIG_DWC_ETH_QOS=y

diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 22afce410e89af1248f53ea759d84adadfbfbe8e..492f1e29c8ad71e7c4bb4733afe196a727dda618 100644 (file)
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -35,7 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/phycore_am62ax_r5_defconfig b/configs/phycore_am62ax_r5_defconfig
index e37e3eca6517b1709ad077ba8a2b40fb93d1fd0c..8ee6ed73adca01e42b52f447b0f74e92b8bb621f 100644 (file)
--- a/configs/phycore_am62ax_r5_defconfig
+++ b/configs/phycore_am62ax_r5_defconfig
@@ -65,7 +65,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_DEVICE_REMOVE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y

diff --git a/configs/picasso_defconfig b/configs/picasso_defconfig
index e8a47f8cbf644b79357a85f0226d500a3efaa4d7..11cf01ee0ef11bd7cf06071c33664bbef3682ef7 100644 (file)
--- a/configs/picasso_defconfig
+++ b/configs/picasso_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x11000000

diff --git a/configs/qc750_defconfig b/configs/qc750_defconfig
index 0088580513e5cbf22c30d490330005b7d13772c2..3f85890bdbdd2dcd31d82714ef3b17f7881268b2 100644 (file)
--- a/configs/qc750_defconfig
+++ b/configs/qc750_defconfig
@@ -53,7 +53,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
index 7864fc5077364a8b68fa9aea90820bc4419daae8..414bfdebab1b756313da882bab57f1073d49864b 100644 (file)
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -32,7 +32,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig
index b0da941e9ce59211baf7d2c4805cf94ba0c29aea..12d92067de533deb6258c48c36cfb3a8b6418ae7 100644 (file)
--- a/configs/r8a77995_draak_defconfig
+++ b/configs/r8a77995_draak_defconfig
@@ -31,7 +31,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig
index 8dcf8e35ee09d0b147592000d86b7fbed898b23d..fefe356ed2b18f4b8a51f352ff79c6269a285c50 100644 (file)
--- a/configs/r8a779g0_whitehawk_defconfig
+++ b/configs/r8a779g0_whitehawk_defconfig
@@ -19,7 +19,7 @@ CONFIG_CMD_REMOTEPROC=y
 CONFIG_REMOTEPROC_RENESAS_APMU=y
 CONFIG_SYS_CBSIZE=2048
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BITBANGMII=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

diff --git a/configs/r8a779h0_grayhawk_defconfig b/configs/r8a779h0_grayhawk_defconfig
index 5b9ad93a5968284e410233ab501b1b590c56819d..33009429315403734dd9bbcbb20fdac8cd8b363e 100644 (file)
--- a/configs/r8a779h0_grayhawk_defconfig
+++ b/configs/r8a779h0_grayhawk_defconfig
@@ -14,7 +14,7 @@ CONFIG_BOOTCOMMAND="tftp 0x48080000 Image && tftp 0x48000000 Image-r8a779h0-gray
 CONFIG_DEFAULT_FDT_FILE="r8a779h0-gray-hawk.dtb"
 CONFIG_SYS_CBSIZE=2048
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BITBANGMII=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index 61183be948ab6b50153817401c390a7e40a25578..15ec0a459015996c3fb292ddda223d1aba72afc3 100644 (file)
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -38,7 +38,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index dab1c9a73530cbf9195ccde7e347f014da1b144d..41bdee1968267ea295c622e3cceef720bebd189e 100644 (file)
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -33,7 +33,7 @@ CONFIG_OF_DTB_PROPS_REMOVE=y
 CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/renesas_rzg2l_smarc_defconfig b/configs/renesas_rzg2l_smarc_defconfig
index f9847de261d22e3c6056578b85c65c57b1b88bdd..e7c0a7e1eae6e43b5613792afe4e2099ca5b922b 100644 (file)
--- a/configs/renesas_rzg2l_smarc_defconfig
+++ b/configs/renesas_rzg2l_smarc_defconfig
@@ -42,7 +42,7 @@ CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y

diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig
index 5e19d36502769ba3767ffb190682ddf99bb29e3f..0b91337b17b24bcdb311e093ba01a11db8a6b03d 100644 (file)
--- a/configs/rzg2_beacon_defconfig
+++ b/configs/rzg2_beacon_defconfig
@@ -23,7 +23,7 @@ CONFIG_OF_LIST="renesas/r8a774a1-beacon-rzg2m-kit renesas/r8a774b1-beacon-rzg2n-
 CONFIG_MULTI_DTB_FIT_LZO=y
 CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DM_PCA953X=y
 CONFIG_SYS_I2C_RCAR_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 5e04090ef2b044570b9d071832557a589796ef80..d3611591e571895fcbced51e223488636f100359 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -38,7 +38,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA_KEYBOARD=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig
index 65f7e8c212cc064dba0f6189ac3f5f11e2f7f924..bebe6870da42114fbe501574226e73c23b33253a 100644 (file)
--- a/configs/sei510_defconfig
+++ b/configs/sei510_defconfig
@@ -53,7 +53,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x6000000

diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig
index 90f7a6fbf2705c01818b42a2fe348380fa22d8ec..b7de10d71a956432269de0167f7a5b6d03f37c41 100644 (file)
--- a/configs/sei610_defconfig
+++ b/configs/sei610_defconfig
@@ -53,7 +53,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x6000000

diff --git a/configs/star_defconfig b/configs/star_defconfig
index 1ba3c00b063121d31d8905bc4fe8632ccf9ae44b..a783fd86c746a582785295df8834fd36ef2651bc 100644 (file)
--- a/configs/star_defconfig
+++ b/configs/star_defconfig
@@ -54,7 +54,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x11000000

diff --git a/configs/stm32mp13_dhcor_defconfig b/configs/stm32mp13_dhcor_defconfig
index 2357692c4c449e1b907f52e6070601886b902e43..e5aaadd3920fc02a3e7ea6750474044e336f9fee 100644 (file)
--- a/configs/stm32mp13_dhcor_defconfig
+++ b/configs/stm32mp13_dhcor_defconfig
@@ -35,7 +35,7 @@ CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_ENV_MMC_DEVICE_INDEX=0
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_PHY_REALTEK=y
 CONFIG_DM_REGULATOR_SCMI=y
 CONFIG_RESET_SCMI=y

diff --git a/configs/surface-rt_defconfig b/configs/surface-rt_defconfig
index 71ee397d55abd627fef07636c50fd50b326724a1..4cd543ccb9c80803a4704bafebd47644aa9c7978 100644 (file)
--- a/configs/surface-rt_defconfig
+++ b/configs/surface-rt_defconfig
@@ -50,7 +50,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index efc3f195c1b268fdf27fc98b26cc9c499e2f5f6a..070dce234d66c4b3a908ed2b5580d4a2d58f133c 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -69,7 +69,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y

diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index fd8e96dfb09d4c81d13857ff59636ed3206d80e3..39fb127ce351c212740f187fcb48f243358eff99 100644 (file)
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -39,7 +39,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/tegratab_defconfig b/configs/tegratab_defconfig
index 93c9841e35f453a9e6bf95479f67508899e6e0ab..00a0843d4d08ac895de0bd1393946339e76fbb08 100644 (file)
--- a/configs/tegratab_defconfig
+++ b/configs/tegratab_defconfig
@@ -53,7 +53,7 @@ CONFIG_TEGRA_PARTITION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/tf701t_defconfig b/configs/tf701t_defconfig
index 620f8539273477facd04b4f1c1ebe2e1341af0a5..a9976bf0388aded64cfc3c754fb968ad8f48230e 100644 (file)
--- a/configs/tf701t_defconfig
+++ b/configs/tf701t_defconfig
@@ -53,7 +53,7 @@ CONFIG_TEGRA_PARTITION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/toradex-smarc-imx8mp_defconfig b/configs/toradex-smarc-imx8mp_defconfig
index 0e7f1813dc159eec69e91cc87cd3034b57c2bbe6..dd6815d346564a9ddba970b18118b530e24c2bd0 100644 (file)
--- a/configs/toradex-smarc-imx8mp_defconfig
+++ b/configs/toradex-smarc-imx8mp_defconfig
@@ -89,7 +89,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/transformer_t20_defconfig b/configs/transformer_t20_defconfig
index bbda38b2a3bc9e3fdebca5fc4ed591d64ea7cfe8..b4cc4130217631d55c462d8acb0427240883174b 100644 (file)
--- a/configs/transformer_t20_defconfig
+++ b/configs/transformer_t20_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x11000000

diff --git a/configs/transformer_t30_defconfig b/configs/transformer_t30_defconfig
index b1ebd9b9012b92e34c5ddc582ba78c6385684db0..eb3e41e68c5608279f56aba3d26c5914a737f11d 100644 (file)
--- a/configs/transformer_t30_defconfig
+++ b/configs/transformer_t30_defconfig
@@ -56,7 +56,7 @@ CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_CLK_GPIO=y
 CONFIG_USB_FUNCTION_FASTBOOT=y

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 7792da7b90e9f0c12bdd8abe08dfc4718be5f8c4..acfab5755ba9deee8f8d41b830eb604e38bc369a 100644 (file)
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -54,7 +54,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_OF_LIST="armada-3720-turris-mox armada-3720-ripe-atlas"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_ARP_TIMEOUT=200
 CONFIG_NET_RETRY_COUNT=50
 CONFIG_NETCONSOLE=y

diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 9e201bfbf4134dc5542746c80642727ee6befbf7..810dc3f523fa3a70bc7cc837784aa7d60e9f943c 100644 (file)
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -41,7 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index f94c6cf66232c5d4de49bd341f13fdcff538efd5..5fa952f98a565285f4615e0a9435e5844ce88c46 100644 (file)
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -37,7 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y

diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig
index 49431f503c61323b8fe3e4bfac1ad545b5b1080f..4b8e7d9f4900fc028c0110a8158917c8c6fae7a3 100644 (file)
--- a/configs/verdin-am62_a53_defconfig
+++ b/configs/verdin-am62_a53_defconfig
@@ -89,7 +89,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/verdin-am62p_a53_defconfig b/configs/verdin-am62p_a53_defconfig
index a9a18def354b83e922fd7385f58b61470965d6db..e782ad4faca78a0e7b171933461f145956cca3f0 100644 (file)
--- a/configs/verdin-am62p_a53_defconfig
+++ b/configs/verdin-am62p_a53_defconfig
@@ -92,7 +92,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index 66c0d944208ebb6efed8a4279e473a5496d030bf..7db6e81ee6d12aa4949b41d6870744a33b1ab7d4 100644 (file)
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -84,7 +84,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig
index c2f78a9e90f3e48e705b2ee2ae9320ff7e27b069..4cc69de041b46acdfa986f84b3ea18cd56f5d456 100644 (file)
--- a/configs/verdin-imx8mp_defconfig
+++ b/configs/verdin-imx8mp_defconfig
@@ -97,7 +97,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_MMC_DEVICE_INDEX=2
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"

diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index 7a7e45c65de8bb4a4844ff24363407e1c4a79e85..e65d0fb9ef26cac1290e93c1a02e5a6f572cc7af 100644 (file)
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -64,7 +64,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_REDUNDANT=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"

diff --git a/configs/x3_t30_defconfig b/configs/x3_t30_defconfig
index e593a54223984b67040a14351798bb735fdcbf0e..3081d1203cfacd63fad3fb38b3b422866daebbae 100644 (file)
--- a/configs/x3_t30_defconfig
+++ b/configs/x3_t30_defconfig
@@ -52,7 +52,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_MMC_EMMC_HW_PARTITION=2
 CONFIG_BUTTON=y
 CONFIG_EXTCON=y
 CONFIG_EXTCON_MAX14526=y

diff --git a/env/Kconfig b/env/Kconfig
index 1decdd8964843376a26d54c5e9f74b638c32cdc2..3317f3c560307aa59f5852cfb3fd155d5bc3f46e 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -219,7 +219,7 @@ config ENV_IS_IN_MMC
 
          Specifies which MMC device the environment is stored in.
 
-         CONFIG_SYS_MMC_ENV_PART (optional):
+         CONFIG_ENV_MMC_EMMC_HW_PARTITION (optional):
 
          Specifies which MMC partition the environment is stored in. If not
          set, defaults to partition 0, the user area. Common values might be
@@ -252,7 +252,7 @@ config ENV_IS_IN_MMC
          This value may also be positive or negative; this is handled in the
          same way as CONFIG_ENV_OFFSET.
 
-         In case CONFIG_SYS_MMC_ENV_PART is 1 (i.e. environment in eMMC boot
+         In case CONFIG_ENV_MMC_EMMC_HW_PARTITION is 1 (i.e. environment in eMMC boot
          partition) then setting CONFIG_ENV_OFFSET_REDUND to the same value
          as CONFIG_ENV_OFFSET makes use of the second eMMC boot partition for
          the redundant environment copy.
@@ -708,8 +708,8 @@ config ENV_MMC_DEVICE_INDEX
          The index is often derived from DT aliases mmcN node ordering, and
          matches the 'mmc list' command output.
 
-config SYS_MMC_ENV_PART
-       int "mmc partition number"
+config ENV_MMC_EMMC_HW_PARTITION
+       int "eMMC hardware partition number"
        depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT
        default 0
        help

diff --git a/env/mmc.c b/env/mmc.c
index dba99bd4d3d905e3c29f41baf25ec14f89f535aa..5d1cb78e5cad1d1efd53c1785ae690a89648cc39 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -157,7 +157,7 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy)
        int hwpart = 0;
        int err;
 
-#if defined(CONFIG_SYS_MMC_ENV_PART)
+#if defined(CONFIG_ENV_MMC_EMMC_HW_PARTITION)
        hwpart = mmc_get_env_part(mmc);
 #endif
 
@@ -216,7 +216,7 @@ static bool mmc_env_is_redundant_in_both_boot_hwparts(struct mmc *mmc)
        if (!IS_ENABLED(CONFIG_ENV_REDUNDANT))
                return false;
 
-       if (CONFIG_SYS_MMC_ENV_PART != 1)
+       if (CONFIG_ENV_MMC_EMMC_HW_PARTITION != 1)
                return false;
 
        return mmc_offset(mmc, 0) == mmc_offset(mmc, 1);
@@ -239,10 +239,10 @@ __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
        return 0;
 }
 
-#ifdef CONFIG_SYS_MMC_ENV_PART
+#ifdef CONFIG_ENV_MMC_EMMC_HW_PARTITION
 __weak uint mmc_get_env_part(struct mmc *mmc)
 {
-       return CONFIG_SYS_MMC_ENV_PART;
+       return CONFIG_ENV_MMC_EMMC_HW_PARTITION;
 }
 
 static unsigned char env_mmc_orig_hwpart;

diff --git a/include/mmc.h b/include/mmc.h
index 87f7ef131b639a8f07a6ef37305cb167abeeb439..c6b2ab4a29fb9accedaa2a5cbb8ee36d90423eee 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -996,7 +996,7 @@ void board_mmc_power_init(void);
 int board_mmc_init(struct bd_info *bis);
 int cpu_mmc_init(struct bd_info *bis);
 int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr);
-# ifdef CONFIG_SYS_MMC_ENV_PART
+# ifdef CONFIG_ENV_MMC_EMMC_HW_PARTITION
 extern uint mmc_get_env_part(struct mmc *mmc);
 # endif
 int mmc_get_env_dev(void);