Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Subsystems (12)
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PART
---
Due to some non-environment usage of the variables, cc'ing a few folks.
--- configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_sl50_defconfig | 2 ++ configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_usb_defconfig | 1 + configs/am65x_evm_a53_defconfig | 1 + configs/am65x_hs_evm_a53_defconfig | 1 + configs/apalis-imx8qm_defconfig | 1 + configs/apalis-tk1_defconfig | 1 + configs/apalis_imx6_defconfig | 1 + configs/apalis_t30_defconfig | 1 + configs/bcm11130_defconfig | 1 - configs/beaver_defconfig | 1 + configs/brppt1_mmc_defconfig | 2 ++ configs/brxre1_defconfig | 2 ++ configs/cardhu_defconfig | 1 + configs/cei-tk1-som_defconfig | 1 + configs/colibri-imx8qxp_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx7_emmc_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/deneb_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_usb_defconfig | 1 + configs/dragonboard410c_defconfig | 1 + configs/e2220-1170_defconfig | 1 + configs/evb-rk3328_defconfig | 1 + configs/ficus-rk3399_defconfig | 1 + configs/giedi_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/hikey_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/imx8mm_beacon_defconfig | 1 + configs/imx8mm_evk_defconfig | 1 + configs/imx8mp_evk_defconfig | 1 + configs/imx8mq_evk_defconfig | 1 + configs/imx8mq_phanbell_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_rom7720_a1_4G_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/j721e_evm_a72_defconfig | 1 + configs/j721e_hs_evm_a72_defconfig | 1 + configs/j721e_hs_evm_r5_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/kp_imx6q_tpc_defconfig | 1 + configs/mx6dlarm2_defconfig | 1 + configs/mx6dlarm2_lpddr2_defconfig | 1 + configs/mx6qarm2_defconfig | 1 + configs/mx6qarm2_lpddr2_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spl_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/mx6ull_14x14_evk_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 1 + configs/mx6ulz_14x14_evk_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/opos6uldev_defconfig | 1 + configs/p2371-0000_defconfig | 1 + configs/p2371-2180_defconfig | 1 + configs/p2571_defconfig | 1 + configs/p2771-0000-000_defconfig | 1 + configs/p2771-0000-500_defconfig | 1 + configs/paz00_defconfig | 1 + configs/phycore-rk3288_defconfig | 1 + configs/pico-imx8mq_defconfig | 1 + configs/puma-rk3399_defconfig | 1 + configs/r8a77990_ebisu_defconfig | 2 ++ configs/r8a77995_draak_defconfig | 1 + configs/rcar3_salvator-x_defconfig | 2 ++ configs/rcar3_ulcb_defconfig | 2 ++ configs/riotboard_defconfig | 1 + configs/riotboard_spl_defconfig | 1 + configs/roc-cc-rk3328_defconfig | 1 + configs/rock-pi-e-rk3328_defconfig | 1 + configs/rock64-rk3328_defconfig | 1 + configs/rock960-rk3399_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/sei510_defconfig | 2 ++ configs/sei610_defconfig | 2 ++ configs/somlabs_visionsom_6ull_defconfig | 1 + configs/tbs2910_defconfig | 2 ++ configs/tec-ng_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + configs/tinker-s-rk3288_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + configs/verdin-imx8mm_defconfig | 1 + configs/vining_2000_defconfig | 1 + configs/vyasa-rk3288_defconfig | 1 + configs/xpress_defconfig | 1 + configs/xpress_spl_defconfig | 1 + configs/zc5202_defconfig | 2 ++ configs/zc5601_defconfig | 2 ++ env/Kconfig | 19 +++++++++++++++++++ include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xRDB.h | 5 ----- include/configs/T104xRDB.h | 2 -- include/configs/T208xQDS.h | 5 ----- include/configs/T208xRDB.h | 5 ----- include/configs/T4240RDB.h | 5 ----- include/configs/UCP1020.h | 4 ---- include/configs/am335x_evm.h | 2 -- include/configs/am335x_shc.h | 5 ----- include/configs/am335x_sl50.h | 5 ----- include/configs/am57xx_evm.h | 2 -- include/configs/am65x_evm.h | 4 ---- include/configs/apalis-imx8.h | 2 -- include/configs/apalis-tk1.h | 2 -- include/configs/apalis_imx6.h | 2 -- include/configs/apalis_t30.h | 2 -- include/configs/apx4devkit.h | 3 --- include/configs/at91-sama5_common.h | 5 ----- include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/bcm23550_w1d.h | 1 - include/configs/bcm28155_ap.h | 1 - include/configs/bcm7260.h | 2 -- include/configs/beaver.h | 2 -- include/configs/brppt1.h | 4 ---- include/configs/brxre1.h | 2 -- include/configs/capricorn-common.h | 2 -- include/configs/cardhu.h | 2 -- include/configs/cei-tk1-som.h | 2 -- include/configs/cgtqmx6eval.h | 4 ---- include/configs/chiliboard.h | 2 -- include/configs/ci20.h | 1 - include/configs/clearfog.h | 1 - include/configs/colibri-imx8x.h | 2 -- include/configs/colibri_imx6.h | 2 -- include/configs/colibri_imx7.h | 2 -- include/configs/colibri_t30.h | 2 -- include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/dalmore.h | 2 -- include/configs/dart_6ul.h | 2 -- include/configs/dh_imx6.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/draak.h | 2 -- include/configs/dragonboard410c.h | 3 --- include/configs/e2220-1170.h | 2 -- include/configs/ebisu.h | 2 -- include/configs/edison.h | 2 -- include/configs/el6x_common.h | 5 ----- include/configs/elgin_rv1108.h | 2 -- include/configs/embestmx6boards.h | 1 - include/configs/evb_px30.h | 2 -- include/configs/evb_px5.h | 2 -- include/configs/evb_rk3128.h | 2 -- include/configs/evb_rk3229.h | 2 -- include/configs/evb_rk3288.h | 2 -- include/configs/evb_rk3308.h | 1 - include/configs/evb_rk3328.h | 2 -- include/configs/evb_rk3399.h | 4 ---- include/configs/exynos5-common.h | 2 -- include/configs/firefly-rk3288.h | 2 -- include/configs/firefly_rk3308.h | 1 - include/configs/gru.h | 2 -- include/configs/gw_ventana.h | 4 ---- include/configs/helios4.h | 1 - include/configs/hikey.h | 2 -- include/configs/imx6-engicam.h | 3 --- include/configs/imx6dl-mamoj.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 | 2 -- include/configs/imx8qm_rom7720.h | 3 --- include/configs/imx8qxp_mek.h | 2 -- include/configs/imxrt1020-evk.h | 2 -- include/configs/imxrt1050-evk.h | 2 -- include/configs/j721e_evm.h | 4 ---- include/configs/jetson-tk1.h | 2 -- include/configs/kp_imx53.h | 1 - include/configs/kp_imx6q_tpc.h | 2 -- include/configs/kylin_rk3036.h | 2 -- include/configs/lion_rk3368.h | 1 - include/configs/liteboard.h | 2 -- include/configs/ls1021aiot.h | 4 ---- include/configs/ls1021aqds.h | 4 ---- include/configs/ls1021atsn.h | 4 ---- include/configs/ls1021atwr.h | 4 ---- include/configs/ls1028a_common.h | 1 - include/configs/ls1043aqds.h | 9 --------- include/configs/ls1043ardb.h | 9 --------- include/configs/ls1046afrwy.h | 1 - include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls1088aqds.h | 7 ------- include/configs/ls1088ardb.h | 2 -- include/configs/ls2080aqds.h | 6 ------ include/configs/ls2080ardb.h | 3 --- include/configs/lx2160a_common.h | 2 -- include/configs/meerkat96.h | 2 -- include/configs/meson64_android.h | 3 --- include/configs/miqi_rk3288.h | 2 -- include/configs/mt7622.h | 2 -- include/configs/mt7623.h | 2 -- include/configs/mt8512.h | 1 - include/configs/mt8518.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mx23_olinuxino.h | 3 --- include/configs/mx23evk.h | 3 --- include/configs/mx25pdk.h | 1 - include/configs/mx28evk.h | 3 --- include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 1 - include/configs/mx53cx9020.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6sabreauto.h | 3 --- include/configs/mx6sabresd.h | 3 --- include/configs/mx6slevk.h | 3 --- include/configs/mx6sllevk.h | 2 -- include/configs/mx6sxsabreauto.h | 3 --- include/configs/mx6sxsabresd.h | 3 --- include/configs/mx6ul_14x14_evk.h | 2 -- include/configs/mx6ullevk.h | 2 -- include/configs/mx7dsabresd.h | 3 --- include/configs/mx7ulp_com.h | 1 - include/configs/mx7ulp_evk.h | 2 -- include/configs/nitrogen6x.h | 4 ---- include/configs/novena.h | 3 --- include/configs/nyan-big.h | 2 -- include/configs/odroid.h | 1 - include/configs/odroid_go2.h | 2 -- include/configs/omap4_sdp4430.h | 1 - include/configs/omap5_uevm.h | 1 - include/configs/opos6uldev.h | 2 -- include/configs/origen.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p2371-0000.h | 2 -- include/configs/p2371-2180.h | 2 -- include/configs/p2571.h | 2 -- include/configs/p2771-0000.h | 2 -- include/configs/paz00.h | 2 -- include/configs/pcl063_ull.h | 2 -- include/configs/pcm052.h | 3 --- include/configs/phycore_am335x_r2.h | 1 - include/configs/phycore_rk3288.h | 2 -- include/configs/pico-imx6.h | 1 - include/configs/pico-imx6ul.h | 4 ---- include/configs/pico-imx7d.h | 3 --- include/configs/pico-imx8mq.h | 1 - include/configs/platinum.h | 1 - include/configs/poplar.h | 3 --- include/configs/popmetal_rk3288.h | 2 -- include/configs/puma_rk3399.h | 4 ---- include/configs/rock.h | 2 -- include/configs/rock2.h | 2 -- include/configs/rock960_rk3399.h | 2 -- include/configs/s32v234evb.h | 2 -- include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 2 -- include/configs/salvator-x.h | 2 -- include/configs/sc_sps_1.h | 3 --- include/configs/seaboard.h | 2 -- include/configs/secomx6quq7.h | 1 - include/configs/sheep_rk3368.h | 1 - include/configs/sksimx6.h | 1 - include/configs/smdkv310.h | 1 - include/configs/socfpga_common.h | 3 --- include/configs/socfpga_soc64_common.h | 1 - include/configs/somlabs_visionsom_6ull.h | 2 -- include/configs/sunxi-common.h | 2 -- include/configs/tbs2910.h | 2 -- include/configs/tec-ng.h | 2 -- include/configs/tinker_rk3288.h | 2 -- include/configs/titanium.h | 1 - include/configs/tqma6.h | 2 -- include/configs/trats.h | 2 -- include/configs/trats2.h | 2 -- include/configs/ts4600.h | 3 --- include/configs/ts4800.h | 2 -- include/configs/udoo.h | 2 -- include/configs/udoo_neo.h | 1 - include/configs/ulcb.h | 2 -- include/configs/uniphier.h | 3 --- include/configs/usbarmory.h | 1 - include/configs/venice2.h | 2 -- include/configs/ventana.h | 2 -- include/configs/verdin-imx8mm.h | 2 -- include/configs/vf610twr.h | 4 ---- include/configs/vining_2000.h | 2 -- include/configs/vyasa-rk3288.h | 2 -- include/configs/wandboard.h | 2 -- include/configs/warp.h | 2 -- include/configs/warp7.h | 3 --- include/configs/xpress.h | 2 -- scripts/config_whitelist.txt | 2 -- 308 files changed, 132 insertions(+), 448 deletions(-)
configs/am335x_boneblack_vboot_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y # CONFIG_SPL_BLK is not set CONFIG_BOOTCOUNT_LIMIT=y
configs/am335x_shc_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y
configs/am335x_shc_ict_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y
configs/am335x_sl50_defconfig +2 -0
@@ -45,6 +45,8 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-sl50" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_MMC=y
configs/am57xx_evm_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/am57xx_hs_evm_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/am65x_evm_a53_defconfig +1 -0
@@ -66,6 +66,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/am65x_hs_evm_a53_defconfig +1 -0
@@ -69,6 +69,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/apalis-imx8qm_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_CLK_IMX8=y
configs/apalis-tk1_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 CONFIG_SPL_DM=y
configs/apalis_imx6_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096
configs/apalis_t30_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 CONFIG_SPL_DM=y
configs/bcm11130_defconfig +0 -1
@@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0xae000000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x2340000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0" CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set
configs/beaver_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/brppt1_mmc_defconfig +2 -0
@@ -69,6 +69,8 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/brxre1_defconfig +2 -0
@@ -68,6 +68,8 @@ CONFIG_OF_SPL_REMOVE_PROPS="" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y
configs/cardhu_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_SYS_I2C_TEGRA=y CONFIG_SF_DEFAULT_MODE=0
configs/cei-tk1-som_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/colibri-imx8qxp_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_CLK_IMX8=y
configs/colibri_imx6_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352
configs/colibri_imx7_emmc_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352
configs/colibri_t30_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 CONFIG_SPL_DM=y
configs/dalmore_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/deneb_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8-deneb" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/dra7xx_evm_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/dra7xx_hs_evm_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/dragonboard410c_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_CLK=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x91000000
configs/e2220-1170_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y
configs/evb-rk3328_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_TPL_DM=y CONFIG_REGMAP=y
configs/ficus-rk3399_defconfig +1 -0
@@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/giedi_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8-giedi" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/gwventana_emmc_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y
configs/gwventana_gw5904_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_SUPPORT_EMMC_RPMB=y
configs/hikey_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_CMD_CACHE=y CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_K3=y
configs/imx6dl_mamoj_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_DFU_MMC=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000
configs/imx8mm_beacon_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-beacon-kit" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
configs/imx8mm_evk_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_SPL_CLK_COMPOSITE_CCF=y
configs/imx8mp_evk_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_CLK_COMPOSITE_CCF=y
configs/imx8mq_evk_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y
configs/imx8mq_phanbell_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-phanbell" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y
configs/imx8qm_mek_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y
configs/imx8qm_rom7720_a1_4G_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8qm-rom7720-a1" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y
configs/imx8qxp_mek_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y
configs/j721e_evm_a72_defconfig +1 -0
@@ -77,6 +77,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/j721e_hs_evm_a72_defconfig +1 -0
@@ -70,6 +70,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y
configs/j721e_hs_evm_r5_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y
configs/jetson-tk1_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/kp_imx6q_tpc_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rate CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 # CONFIG_BLOCK_CACHE is not set CONFIG_SPL_CLK_IMX6Q=y CONFIG_CLK_IMX6Q=y
configs/mx6dlarm2_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_FSL_USDHC=y CONFIG_MII=y CONFIG_MXC_UART=y
configs/mx6dlarm2_lpddr2_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_FSL_USDHC=y CONFIG_MII=y CONFIG_MXC_UART=y
configs/mx6qarm2_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_FSL_USDHC=y CONFIG_MII=y CONFIG_MXC_UART=y
configs/mx6qarm2_lpddr2_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_FSL_USDHC=y CONFIG_MII=y CONFIG_MXC_UART=y
configs/mx6sabresd_defconfig +1 -0
@@ -66,6 +66,7 @@ CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000
configs/mx6slevk_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y
configs/mx6slevk_spl_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y
configs/mx6sxsabresd_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sdb" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y
configs/mx6ul_14x14_evk_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_DM_74X164=y
configs/mx6ul_9x9_evk_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-9x9-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y
configs/mx6ull_14x14_evk_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y
configs/mx6ull_14x14_evk_plugin_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y
configs/mx6ulz_14x14_evk_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y # CONFIG_NET is not set CONFIG_DM_74X164=y
configs/nyan-big_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/omap4_sdp4430_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_PARTITION_UUIDS=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_DM=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y
configs/omap5_uevm_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y CONFIG_DM_MMC=y
configs/opos6uldev_defconfig +1 -0
@@ -66,6 +66,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y
configs/p2371-0000_defconfig +1 -0
@@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y
configs/p2371-2180_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y
configs/p2571_defconfig +1 -0
@@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y
configs/p2771-0000-000_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SYS_I2C_TEGRA=y CONFIG_TEGRA186_BPMP_I2C=y CONFIG_DWC_ETH_QOS=y
configs/p2771-0000-500_defconfig +1 -0
@@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SYS_I2C_TEGRA=y CONFIG_TEGRA186_BPMP_I2C=y CONFIG_DWC_ETH_QOS=y
configs/paz00_defconfig +1 -0
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y
configs/phycore-rk3288_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-phycore-rdk" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
configs/pico-imx8mq_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-pico-pi" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y
configs/puma-rk3399_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MISC=y
configs/r8a77990_ebisu_defconfig +2 -0
@@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu-u-boot" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y
configs/r8a77995_draak_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak-u-boot" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y
configs/rcar3_salvator-x_defconfig +2 -0
@@ -37,6 +37,8 @@ CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y
configs/rcar3_ulcb_defconfig +2 -0
@@ -37,6 +37,8 @@ CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y
configs/riotboard_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_DM=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y
configs/riotboard_spl_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_DM=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y
configs/roc-cc-rk3328_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_TPL_DM=y CONFIG_REGMAP=y
configs/rock-pi-e-rk3328_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_TPL_DM=y CONFIG_REGMAP=y
configs/rock64-rk3328_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_TPL_DM=y CONFIG_REGMAP=y
configs/rock960-rk3399_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y
configs/seaboard_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_SYS_I2C_TEGRA=y CONFIG_TEGRA_KEYBOARD=y
configs/sei510_defconfig +2 -0
@@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12a-sei510" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x6000000
configs/sei610_defconfig +2 -0
@@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-sei610" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x6000000
configs/somlabs_visionsom_6ull_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-somlabs-visionsom" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_FSL_USDHC=y
configs/tbs2910_defconfig +2 -0
@@ -60,6 +60,8 @@ 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" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=2 +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_DM=y CONFIG_DWC_AHSATA=y CONFIG_DM_I2C=y
configs/tec-ng_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_SYS_I2C_TEGRA=y CONFIG_SF_DEFAULT_MODE=0
configs/tinker-rk3288_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker" CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
configs/tinker-s-rk3288_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker-s" CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
configs/venice2_defconfig +1 -0
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y
configs/ventana_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_SPL_DM=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y
configs/verdin-imx8mm_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096
configs/vining_2000_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000" CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_RPMB=y
configs/vyasa-rk3288_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
configs/xpress_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y
configs/xpress_spl_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=1 CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y
configs/zc5202_defconfig +2 -0
@@ -39,6 +39,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y
configs/zc5601_defconfig +2 -0
@@ -38,6 +38,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y
env/Kconfig +19 -0
@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is not inside the binary. Some systems need this and for the rest, it doesn't hurt. +config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \ + CMD_MVEBU_BUBT || FMAN_ENET || QE + default 0 + help + MMC device number on the platform where the environment is stored. + +config SYS_MMC_ENV_PART + int "mmc partition number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT + default 0 + help + MMC hardware partition device number on the platform where the + environment is stored. Note that this is not related to any software + defined partition table but instead if we are in the user area, which is + partition 0 or the first boot partition, which is 1 or some other defined + partition. + config USE_DEFAULT_ENV_FILE bool "Create default environment from file" help
include/configs/P1010RDB.h +0 -1
@@ -638,7 +638,6 @@ extern unsigned long get_sdram_size(void);*/ #if defined(CONFIG_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#elif defined(CONFIG_MTD_RAW_NAND )#ifdef CONFIG_TPL_BUILD #define SPL_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
include/configs/P2041RDB.h +0 -1
@@ -51,7 +51,6 @@#if defined(CONFIG_SPIFLASH )#elif defined(CONFIG_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #ifndef __ASSEMBLY__
include/configs/T102xRDB.h +0 -5
@@ -134,11 +134,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc#endif -#if defined(CONFIG_SPIFLASH ) -#elif defined(CONFIG_SDCARD ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#ifndef __ASSEMBLY__unsigned long get_board_sys_clk (void );unsigned long get_board_ddr_clk (void );
include/configs/T104xRDB.h +0 -2
@@ -159,8 +159,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SPIFLASH ) -#elif defined(CONFIG_SDCARD ) -#define CONFIG_SYS_MMC_ENV_DEV 0#elif defined(CONFIG_MTD_RAW_NAND )#ifdef CONFIG_NXP_ESBC #define CONFIG_RAMBOOT_NAND
include/configs/T208xQDS.h +0 -5
@@ -115,11 +115,6 @@#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#endif -#if defined(CONFIG_SPIFLASH ) -#elif defined(CONFIG_SDCARD ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#ifndef __ASSEMBLY__unsigned long get_board_sys_clk (void );unsigned long get_board_ddr_clk (void );
include/configs/T208xRDB.h +0 -5
@@ -97,11 +97,6 @@#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#endif -#if defined(CONFIG_SPIFLASH ) -#elif defined(CONFIG_SDCARD ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#ifndef __ASSEMBLY__unsigned long get_board_sys_clk (void );unsigned long get_board_ddr_clk (void );
include/configs/T4240RDB.h +0 -5
@@ -276,11 +276,6 @@"setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000" -#if defined(CONFIG_SPIFLASH ) -#elif defined(CONFIG_SDCARD ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define CONFIG_SYS_CLK_FREQ 66666666#define CONFIG_DDR_CLK_FREQ 133333333
include/configs/UCP1020.h +0 -4
@@ -32,9 +32,6 @@#define FWENV_TYPE FWENV_NOR_FLASH#if (FWENV_TYPE ==FWENV_MMC ) -#ifndef CONFIG_SYS_MMC_ENV_DEV -#define CONFIG_SYS_MMC_ENV_DEV 1 -#endif #define FWENV_ADDR1 -1#define FWENV_ADDR2 -1#define FWENV_ADDR3 -1
@@ -369,7 +366,6 @@*/ #if !defined(CONFIG_ENV_FIT_UCBOOT ) && defined(CONFIG_RAMBOOT_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #define CONFIG_LOADS_ECHO /* echo on for serial download */
include/configs/am335x_evm.h +0 -2
@@ -275,8 +275,6 @@#if defined(CONFIG_SPI_BOOT )/* SPL related */ #elif defined(CONFIG_EMMC_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 0#define CONFIG_SYS_MMC_MAX_DEVICE 2#elif defined(CONFIG_ENV_IS_IN_NAND )#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
include/configs/am335x_shc.h +0 -5
@@ -30,11 +30,6 @@* in case of SD Card or Network boot we want to have a possibility to * debrick the shc, therefore do not read environment from eMMC */ -#if defined(CONFIG_SHC_SDBOOT ) || defined(CONFIG_SHC_NETBOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#else -#define CONFIG_SYS_MMC_ENV_DEV 1 -#endif /* * Info when using boot partitions: As environment resides within first
include/configs/am335x_sl50.h +0 -5
@@ -75,11 +75,6 @@/* disable EFI partitions and partition UUID support */ #endif -#if defined(CONFIG_EMMC_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2 -#endif -/* Network. */ #endif /* ! __CONFIG_AM335X_SL50_H */
include/configs/am57xx_evm.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_IODELAY_RECALIBRATION /* MMC ENV related defines */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 0#define CONFIG_SYS_BOOTM_LEN SZ_64M
include/configs/am65x_evm.h +0 -4
@@ -141,10 +141,6 @@EXTRA_ENV_DFUARGS /* MMC ENV related defines */ -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1 -#endif /* Now for the remaining common defines */#include <configs/ti_armv7_common.h>
include/configs/apalis-imx8.h +0 -2
@@ -84,8 +84,6 @@#define CONFIG_SYS_INIT_SP_ADDR 0x80200000/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 1#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
include/configs/apalis-tk1.h +0 -2
@@ -20,8 +20,6 @@#define FDT_MODULE_V1_0 "apalis"/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1/* PCI host support */ #undef CONFIG_PCI_SCAN_SHOW
include/configs/apalis_imx6.h +0 -2
@@ -198,8 +198,6 @@#if defined(CONFIG_ENV_IS_IN_MMC )/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1#endif #endif /* __CONFIG_H */
include/configs/apalis_t30.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1/* PCI networking support */ #define CONFIG_E1000_NO_NVM
include/configs/apx4devkit.h +0 -3
@@ -25,9 +25,6 @@#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* Environment is in NAND */ #if defined(CONFIG_CMD_NAND ) && defined(CONFIG_ENV_IS_IN_NAND )
include/configs/at91-sama5_common.h +0 -5
@@ -25,11 +25,6 @@#define CONFIG_BOOTP_BOOTFILESIZE #ifdef CONFIG_SD_BOOT - -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \ "setenv dtb_name at91-${board_name}.dtb; " \ "fi; " \
include/configs/at91sam9260ek.h +0 -1
@@ -129,7 +129,6 @@#else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ /* For FAT system, most cases it should be in the reserved sector */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_BOOTCOMMAND \ "fatload mmc 0:1 0x22000000 uImage; bootm"
include/configs/at91sam9n12ek.h +0 -1
@@ -98,7 +98,6 @@#ifdef CONFIG_ENV_IS_IN_MMC /* Use raw reserved sectors to save environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0#else /* Use file in FAT file to save environment */ #endif
include/configs/bcm23550_w1d.h +0 -1
@@ -76,7 +76,6 @@#define CONFIG_SYS_NS16550_COM1 0x3e000000/* must fit into GPT:u-boot-env partition */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* console configuration */ #define CONFIG_SYS_CBSIZE 1024/* Console buffer size */
include/configs/bcm28155_ap.h +0 -1
@@ -75,7 +75,6 @@#define CONFIG_SYS_NS16550_COM1 0x3e000000/* must fit into GPT:u-boot-env partition */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* console configuration */ #define CONFIG_SYS_CBSIZE 1024/* Console buffer size */
include/configs/bcm7260.h +0 -2
@@ -30,7 +30,5 @@/* * Environment configuration for eMMC. */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0#endif /* __CONFIG_H */
include/configs/beaver.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6
include/configs/brppt1.h +0 -4
@@ -183,10 +183,6 @@ NANDTGTS \#if defined(CONFIG_SPI )/* SPI Flash */ /* Environment */ -#elif defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2 -#elif defined(CONFIG_ENV_IS_IN_NAND )/* No NAND env support in SPL */ #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_ENV_SIZE
include/configs/brxre1.h +0 -2
@@ -64,7 +64,5 @@ BUR_COMMON_ENV \#define CONFIG_INITRD_TAG /* Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2#endif /* __CONFIG_BRXRE1_H__ */
include/configs/capricorn-common.h +0 -2
@@ -136,8 +136,6 @@/* Environment organisation */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1, eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 2/* 2nd boot partition */ /* On CCP board, USDHC1 is for eMMC */ #define CONFIG_MMCROOT "/dev/mmcblk0p2"/* eMMC */
include/configs/cardhu.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6
include/configs/cei-tk1-som.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/cgtqmx6eval.h +0 -4
@@ -86,7 +86,6 @@#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1"#define CONFIG_MMCROOT "/dev/mmcblk0p2" -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
@@ -201,8 +200,5 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* Environment organization */ -#if defined (CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif #endif /* __CONFIG_CGTQMX6EVAL_H */
include/configs/chiliboard.h +0 -2
@@ -161,8 +161,6 @@#if defined(CONFIG_ENV_IS_IN_NAND )#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE -#else -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* Network. */
include/configs/ci20.h +0 -1
@@ -39,7 +39,6 @@#define DM9000_DATA (CONFIG_DM9000_BASE + 2)/* Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer size */
include/configs/clearfog.h +0 -1
@@ -30,7 +30,6 @@#define CONFIG_ENV_MIN_ENTRIES 128/* Environment in MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC * boot image starts @ LBA-0.
include/configs/colibri-imx8x.h +0 -2
@@ -116,8 +116,6 @@#define CONFIG_SYS_INIT_SP_ADDR 0x80200000/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 1#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
include/configs/colibri_imx6.h +0 -2
@@ -177,8 +177,6 @@#if defined(CONFIG_ENV_IS_IN_MMC )/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1#endif #endif /* __CONFIG_H */
include/configs/colibri_imx7.h +0 -2
@@ -197,8 +197,6 @@#if defined(CONFIG_ENV_IS_IN_MMC )/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1#endif #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
include/configs/colibri_t30.h +0 -2
@@ -21,8 +21,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30/* Environment in eMMC, before config block at the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1/* General networking support */ #define CONFIG_TFTP_TSIZE
include/configs/controlcenterd.h +0 -1
@@ -268,7 +268,6 @@#if defined(CONFIG_TRAILBLAZER )#elif defined(CONFIG_RAMBOOT_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #define CONFIG_SYS_LOAD_ADDR 0x2000000/* default load address */
include/configs/corenet_ds.h +0 -1
@@ -64,7 +64,6 @@#if defined(CONFIG_SPIFLASH )#elif defined(CONFIG_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk()/* sysclk for MPC85xx */
include/configs/cyrus.h +0 -1
@@ -52,7 +52,6 @@#if defined(CONFIG_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /*
include/configs/dalmore.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_DALMORE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/dart_6ul.h +0 -2
@@ -42,8 +42,6 @@/* Environment settings */ /* Environment in SD */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0#define MMC_ROOTFS_DEV 0#define MMC_ROOTFS_PART 2
include/configs/dh_imx6.h +0 -1
@@ -48,7 +48,6 @@/* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0#define CONFIG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_SYS_MMC_ENV_DEV 2/* 1 = SDHC3, 2 = SDHC4 (eMMC) */ /* SATA Configs */ #define CONFIG_LBA48
include/configs/dra7xx_evm.h +0 -1
@@ -20,7 +20,6 @@#ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* SLOT2: eMMC(1) */ #endif #if (CONFIG_CONS_INDEX ==1 )
include/configs/draak.h +0 -2
@@ -18,8 +18,6 @@#define COUNTER_FREQUENCY 0xFE502A/* 16.66MHz from CPclk */ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS #define CONFIG_FLASH_SHOW_PROGRESS 45
include/configs/dragonboard410c.h +0 -3
@@ -79,9 +79,6 @@ REFLASH(dragonboard/u-boot.img, 8)\"pxefile_addr_r=0x90100000\0" \BOOTENV -#define CONFIG_SYS_MMC_ENV_DEV 0/* mmc0 = emmc, mmc1 = sd */ -#define CONFIG_SYS_MMC_ENV_PART 2/* Set env partition to BOOT2 partition */ -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M)
include/configs/e2220-1170.h +0 -2
@@ -18,8 +18,6 @@#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/ebisu.h +0 -2
@@ -21,7 +21,5 @@#define COUNTER_FREQUENCY 0xFE502A/* 16.66MHz from CPclk */ /* Environment in eMMC,@the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 2 -#define CONFIG_SYS_MMC_ENV_PART 2#endif /* __EBISU_H */
include/configs/edison.h +0 -2
@@ -26,8 +26,6 @@#define CONFIG_SYS_MALLOC_LEN (128 * 1024 * 1024)/* Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0/* RTC */ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
include/configs/el6x_common.h +0 -5
@@ -88,9 +88,4 @@/* environment organization */ -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2 -#endif -#endif /* __EL6Q_COMMON_CONFIG_H */
include/configs/elgin_rv1108.h +0 -2
@@ -8,6 +8,4 @@#include <configs/rv1108_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/embestmx6boards.h +0 -1
@@ -65,7 +65,6 @@/* RiOTboard */ #define CONFIG_FDTFILE "imx6dl-riotboard.dtb"#define CONFIG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_SYS_MMC_ENV_DEV 2/* SDHC4 */ #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH )/* MarSBoard */ #define CONFIG_FDTFILE "imx6q-marsboard.dtb"
include/configs/evb_px30.h +0 -2
@@ -8,8 +8,6 @@#include <configs/px30_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/evb_px5.h +0 -2
@@ -8,6 +8,4 @@#include <configs/rk3368_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/evb_rk3128.h +0 -2
@@ -8,6 +8,4 @@#include <configs/rk3128_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/evb_rk3229.h +0 -2
@@ -8,6 +8,4 @@#include <configs/rk322x_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/evb_rk3288.h +0 -2
@@ -13,6 +13,4 @@#include <configs/rk3288_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/evb_rk3308.h +0 -1
@@ -9,7 +9,6 @@#include <configs/rk3308_common.h> #define CONFIG_SUPPORT_EMMC_RPMB -#define CONFIG_SYS_MMC_ENV_DEV 0#define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \
include/configs/evb_rk3328.h +0 -2
@@ -8,8 +8,6 @@#include <configs/rk3328_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define SDRAM_BANK_SIZE (2UL << 30)#endif
include/configs/evb_rk3399.h +0 -4
@@ -13,10 +13,6 @@#include <configs/rk3399_common.h> -#if defined(CONFIG_ENV_IS_IN_MMC ) -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define SDRAM_BANK_SIZE (2UL << 30)#endif
include/configs/exynos5-common.h +0 -2
@@ -72,8 +72,6 @@#define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SECURE_BL1_ONLY /* Secure FW size configuration */
include/configs/firefly-rk3288.h +0 -2
@@ -13,6 +13,4 @@#include <configs/rk3288_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/firefly_rk3308.h +0 -1
@@ -9,7 +9,6 @@#include <configs/rk3308_common.h> #define CONFIG_SUPPORT_EMMC_RPMB -#define CONFIG_SYS_MMC_ENV_DEV 0#define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \
include/configs/gru.h +0 -2
@@ -13,6 +13,4 @@#include <configs/rk3399_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/gw_ventana.h +0 -4
@@ -146,10 +146,6 @@*/ /* Persistent Environment Config */ -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1 -#endif /* Environment */ #define CONFIG_IPADDR 192.168.1.1
include/configs/helios4.h +0 -1
@@ -30,7 +30,6 @@#define CONFIG_ENV_MIN_ENTRIES 128/* Environment in MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC * boot image starts @ LBA-0.
include/configs/hikey.h +0 -2
@@ -80,8 +80,6 @@ BOOTENV/* Preserve environment on eMMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* Use eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 2/* Use Boot1 partition */ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512/* Console I/O Buffer Size */
include/configs/imx6-engicam.h +0 -3
@@ -139,9 +139,6 @@#endif /* MMC */ -#ifdef CONFIG_FSL_USDHC -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* NAND */ #ifdef CONFIG_NAND_MXS
include/configs/imx6dl-mamoj.h +0 -1
@@ -46,7 +46,6 @@#define CONFIG_MXC_UART_BASE UART3_BASE/* MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 2/* Ethernet */ #define CONFIG_FEC_MXC_PHYADDR 1
include/configs/imx8mm_beacon.h +0 -1
@@ -108,7 +108,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN SZ_32M
include/configs/imx8mm_evk.h +0 -1
@@ -111,7 +111,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/imx8mn_evk.h +0 -1
@@ -113,7 +113,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/imx8mp_evk.h +0 -1
@@ -121,7 +121,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/imx8mq_evk.h +0 -1
@@ -163,7 +163,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/imx8mq_phanbell.h +0 -1
@@ -155,7 +155,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/imx8qm_mek.h +0 -2
@@ -155,12 +155,10 @@#define CONFIG_SYS_INIT_SP_ADDR 0x80200000/* Default environment is in SD */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/imx8qm_rom7720.h +0 -3
@@ -137,8 +137,6 @@#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#else -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #endif #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
@@ -147,7 +145,6 @@* USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for NAND, * USDHC2 is for SD, USDHC3 is for SD on base board */ -#define CONFIG_SYS_MMC_ENV_DEV 2/* USDHC3 */ #define CONFIG_MMCROOT "/dev/mmcblk2p2"/* USDHC3 */ #define CONFIG_SYS_FSL_USDHC_NUM 3
include/configs/imx8qxp_mek.h +0 -2
@@ -154,12 +154,10 @@#define CONFIG_SYS_INIT_SP_ADDR 0x80200000/* Default environment is in SD */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/imxrt1020-evk.h +0 -2
@@ -28,8 +28,6 @@#define DMAMEM_BASE (PHYS_SDRAM + PHYS_SDRAM_SIZE - \ DMAMEM_SZ_ALL) -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 */ -/* * Configuration of the external SDRAM memory */
include/configs/imxrt1050-evk.h +0 -2
@@ -28,8 +28,6 @@#define DMAMEM_BASE (PHYS_SDRAM + PHYS_SDRAM_SIZE - \ DMAMEM_SZ_ALL) -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 */ -#ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO
include/configs/j721e_evm.h +0 -4
@@ -152,9 +152,5 @@#include <configs/ti_armv7_common.h> /* MMC ENV related defines */ -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1 -#endif #endif /* __CONFIG_J721E_EVM_H */
include/configs/jetson-tk1.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/kp_imx53.h +0 -1
@@ -97,6 +97,5 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* __CONFIG_H_ */
include/configs/kp_imx6q_tpc.h +0 -2
@@ -27,8 +27,6 @@/* FEC ethernet */ #define CONFIG_ARP_TIMEOUT 200UL -#define CONFIG_SYS_MMC_ENV_DEV 1/* 0 = SDHC2, 1 = SDHC4 (eMMC) */ -/* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/kylin_rk3036.h +0 -2
@@ -12,8 +12,6 @@#ifndef CONFIG_SPL_BUILD /* Store env in emmc */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* emmc */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #endif
include/configs/lion_rk3368.h +0 -1
@@ -8,7 +8,6 @@#include <configs/rk3368_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0#define KERNEL_LOAD_ADDR 0x280000#define DTB_LOAD_ADDR 0x5600000#define INITRD_LOAD_ADDR 0x5bf0000
include/configs/liteboard.h +0 -2
@@ -121,8 +121,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* FLASH and environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0#define CONFIG_MMCROOT "/dev/mmcblk0p2"/* USB Configs */
include/configs/ls1021aiot.h +0 -4
@@ -220,10 +220,6 @@#define CONFIG_ENV_OVERWRITE -#if defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define CONFIG_OF_BOARD_SETUP #define CONFIG_OF_STDOUT_VIA_ALIAS
include/configs/ls1021aqds.h +0 -4
@@ -474,10 +474,6 @@ unsigned long get_board_ddr_clk(void);*/ #define CONFIG_ENV_OVERWRITE -#if defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20)/* Increase max gunzip size */
include/configs/ls1021atsn.h +0 -4
@@ -238,10 +238,6 @@/* Environment */ #define CONFIG_ENV_OVERWRITE -#if defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define CONFIG_SYS_BOOTM_LEN 0x8000000/* 128 MB */ #endif
include/configs/ls1021atwr.h +0 -4
@@ -447,10 +447,6 @@*/ #define CONFIG_ENV_OVERWRITE -#if defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20)/* Increase max gunzip size */
include/configs/ls1028a_common.h +0 -1
@@ -95,7 +95,6 @@#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif -#define CONFIG_SYS_MMC_ENV_DEV 0#define OCRAM_NONSECURE_SIZE 0x00010000#define CONFIG_SYS_FSL_QSPI_BASE 0x20000000
include/configs/ls1043aqds.h +0 -9
@@ -396,15 +396,6 @@ unsigned long get_board_ddr_clk(void);*/ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_TFABOOT -#define CONFIG_SYS_MMC_ENV_DEV 0 -#else -#ifdef CONFIG_NAND_BOOT -#elif defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#endif -#define CONFIG_CMDLINE_TAG #include <asm/fsl_secure_boot.h>
include/configs/ls1043ardb.h +0 -9
@@ -244,15 +244,6 @@#define CONFIG_ENV_OVERWRITE #endif -#ifdef CONFIG_TFABOOT -#define CONFIG_SYS_MMC_ENV_DEV 0 -#else -#if defined(CONFIG_NAND_BOOT ) -#elif defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#endif -/* FMan */ #ifndef SPL_NO_FMAN #define AQR105_IRQ_MASK 0x40000000
include/configs/ls1046afrwy.h +0 -1
@@ -96,7 +96,6 @@/* * Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000#ifndef CONFIG_SPL_BUILD
include/configs/ls1046aqds.h +0 -1
@@ -409,7 +409,6 @@ unsigned long get_board_ddr_clk(void);/* * Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_CMDLINE_TAG
include/configs/ls1046ardb.h +0 -1
@@ -153,7 +153,6 @@/* * Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000#define AQR105_IRQ_MASK 0x80000000
include/configs/ls1088aqds.h +0 -7
@@ -15,14 +15,7 @@ unsigned long get_board_ddr_clk(void);#endif #ifdef CONFIG_TFABOOT -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_MISC_INIT_R -#else -#if defined(CONFIG_QSPI_BOOT ) -#elif defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif #endif #if defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI )
include/configs/ls1088ardb.h +0 -2
@@ -8,8 +8,6 @@#include "ls1088a_common.h" -#define CONFIG_SYS_MMC_ENV_DEV 0 -#if defined(CONFIG_TFABOOT ) || \ defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI )#ifndef CONFIG_SPL_BUILD
include/configs/ls2080aqds.h +0 -6
@@ -56,10 +56,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#ifdef CONFIG_TFABOOT -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#define CONFIG_SYS_NOR0_CSPR_EXT (0x0)#define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024)#define CONFIG_SYS_NOR_AMASK_EARLY IFC_AMASK(64*1024*1024)
@@ -227,8 +223,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_SPL_PAD_TO 0x20000#define CONFIG_SYS_NAND_U_BOOT_OFFS (256 * 1024)#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024) -#elif defined(CONFIG_SD_BOOT ) -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #else #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT
include/configs/ls2080ardb.h +0 -3
@@ -70,9 +70,6 @@ unsigned long get_board_sys_clk(void);#define CONFIG_SYS_SCSI_MAX_LUN 1#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#ifdef CONFIG_TFABOOT -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif #if !defined(CONFIG_FSL_QSPI ) || defined(CONFIG_TFABOOT )
include/configs/lx2160a_common.h +0 -2
@@ -170,8 +170,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 -#define CONFIG_SYS_MMC_ENV_DEV 0 -/* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/meerkat96.h +0 -2
@@ -33,8 +33,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET )/* Environment configs */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0 /* USB configs */#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/meson64_android.h +0 -3
@@ -9,9 +9,6 @@#ifndef __MESON64_ANDROID_CONFIG_H#define __MESON64_ANDROID_CONFIG_H -#define CONFIG_SYS_MMC_ENV_DEV 2 -#define CONFIG_SYS_MMC_ENV_PART 1 -#define BOOTENV_DEV_FASTBOOT (devtypeu, devtypel, instance) \ "bootcmd_fastboot=" \
include/configs/miqi_rk3288.h +0 -2
@@ -13,6 +13,4 @@#include <configs/rk3288_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/mt7622.h +0 -2
@@ -23,8 +23,6 @@/* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 0 -/* Uboot definition */ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
include/configs/mt7623.h +0 -2
@@ -57,8 +57,6 @@#define CONFIG_IPADDR 192.168.1.1#define CONFIG_SERVERIP 192.168.1.2 -#define CONFIG_SYS_MMC_ENV_DEV 0 -#ifdef CONFIG_DISTRO_DEFAULTS #define BOOT_TARGET_DEVICES (func) \
include/configs/mt8512.h +0 -1
@@ -31,7 +31,6 @@/* ENV Setting */ #if defined(CONFIG_MMC_MTK ) -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */
include/configs/mt8518.h +0 -1
@@ -34,7 +34,6 @@/* ENV Setting */ #if defined(CONFIG_MMC_MTK ) -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */
include/configs/mvebu_armada-8k.h +0 -1
@@ -46,7 +46,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)/* When runtime detection fails this is the default */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_MAX_CHIPS 1
include/configs/mx23_olinuxino.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* Status LED */
include/configs/mx23evk.h +0 -3
@@ -22,9 +22,6 @@#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* USB */ #ifdef CONFIG_CMD_USB
include/configs/mx25pdk.h +0 -1
@@ -46,7 +46,6 @@#define CONFIG_MXC_UART_BASE UART1_BASE/* No NOR flash present */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* U-Boot general configuration */ #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
include/configs/mx28evk.h +0 -3
@@ -22,9 +22,6 @@#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* Environment is in NAND */ #if defined(CONFIG_CMD_NAND ) && defined(CONFIG_ENV_IS_IN_NAND )
include/configs/mx51evk.h +0 -1
@@ -191,6 +191,5 @@* write the direct value here */ #define CONFIG_BOARD_SIZE_LIMIT 785408 -#define CONFIG_SYS_MMC_ENV_DEV 0#endif
include/configs/mx53ard.h +0 -1
@@ -164,7 +164,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define MX53ARD_CS1GCR1 (CSEN | DSZ(2))#define MX53ARD_CS1RCR1 (RCSN(2) | OEN (1) | RWSC(22))
include/configs/mx53cx9020.h +0 -1
@@ -94,7 +94,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET )/* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 /* Framebuffer and LCD */#define CONFIG_IMX_VIDEO_SKIP
include/configs/mx53evk.h +0 -1
@@ -115,6 +115,5 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* __CONFIG_H */
include/configs/mx53loco.h +0 -1
@@ -170,7 +170,6 @@* write the direct value here */ #define CONFIG_BOARD_SIZE_LIMIT 785408 -#define CONFIG_SYS_MMC_ENV_DEV 0#ifdef CONFIG_CMD_SATA #define CONFIG_SYS_SATA_MAX_DEVICE 1
include/configs/mx53ppd.h +0 -1
@@ -140,7 +140,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* FLASH and environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_FSL_IIM
include/configs/mx53smd.h +0 -1
@@ -110,6 +110,5 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* __CONFIG_H */
include/configs/mx6cuboxi.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_MXC_UART_BASE UART1_BASE#define CONSOLE_DEV "ttymxc0" -#define CONFIG_SYS_MMC_ENV_DEV 0/* SDHC2 */ #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/mx6qarm2.h +0 -1
@@ -115,7 +115,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET )/* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 1 /* USB Configs */#ifdef CONFIG_CMD_USB
include/configs/mx6sabreauto.h +0 -3
@@ -49,9 +49,6 @@#endif #define CONFIG_SYS_FSL_USDHC_NUM 2 -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* I2C Configs */ #define CONFIG_SYS_I2C
include/configs/mx6sabresd.h +0 -3
@@ -29,9 +29,6 @@#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000/* 2MB */ #define CONFIG_SYS_FSL_USDHC_NUM 3 -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 1/* SDHC3 */ -#endif #ifdef CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW
include/configs/mx6slevk.h +0 -3
@@ -131,9 +131,6 @@#endif #define CONFIG_SYS_FSL_USDHC_NUM 3 -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 1/* SDHC2*/ -#endif #define CONFIG_IMX_THERMAL
include/configs/mx6sllevk.h +0 -2
@@ -117,13 +117,11 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* Environment organization */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user partition */ #define CONFIG_MMCROOT "/dev/mmcblk0p2"/* USDHC1 */ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR#define CONFIG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 */ #define CONFIG_IMX_THERMAL
include/configs/mx6sxsabreauto.h +0 -3
@@ -141,8 +141,5 @@#define CONFIG_IMX_THERMAL #define CONFIG_SYS_FSL_USDHC_NUM 2 -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0/*USDHC3*/ -#endif #endif /* __CONFIG_H */
include/configs/mx6sxsabresd.h +0 -3
@@ -186,8 +186,5 @@#endif #define CONFIG_SYS_FSL_USDHC_NUM 3 -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 2/*USDHC4*/ -#endif #endif /* __CONFIG_H */
include/configs/mx6ul_14x14_evk.h +0 -2
@@ -151,8 +151,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* USB Configs */
include/configs/mx6ullevk.h +0 -2
@@ -148,8 +148,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ #define CONFIG_IMX_THERMAL
include/configs/mx7dsabresd.h +0 -3
@@ -131,9 +131,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 2#endif -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ -/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/mx7ulp_com.h +0 -1
@@ -24,7 +24,6 @@* write the direct value here */ #define CONFIG_BOARD_SIZE_LIMIT 785408 -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_MMCROOT "/dev/mmcblk0p2"#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
include/configs/mx7ulp_evk.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_SYS_BOOTM_LEN 0x1000000 -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ #define CONFIG_MMCROOT "/dev/mmcblk0p2"/* USDHC1 */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
include/configs/nitrogen6x.h +0 -4
@@ -145,10 +145,6 @@/* Environment organization */ -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -/* * PCI express */
include/configs/novena.h +0 -3
@@ -24,9 +24,6 @@* as recommended by GNU/fdisk. See below for details: * http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/disc-partition-alignment.html */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage"
include/configs/nyan-big.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* Align LCD to 1MB boundary */ #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE
include/configs/odroid.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV#define CONFIG_ENV_OVERWRITE /* Partitions name */
include/configs/odroid_go2.h +0 -2
@@ -8,8 +8,6 @@#include <configs/px30_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define ROCKCHIP_DEVICE_SETTINGS \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0"
include/configs/omap4_sdp4430.h +0 -1
@@ -20,6 +20,5 @@#include <configs/ti_omap4_common.h> /* ENV related config options */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* SLOT2: eMMC(1) */ #endif /* __CONFIG_SDP4430_H */
include/configs/omap5_uevm.h +0 -1
@@ -31,7 +31,6 @@#define CONFIG_SYS_NS16550_COM3 UART3_BASE/* MMC ENV related defines */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* SLOT2: eMMC(1) */ /* Enhance our eMMC support / experience. */ #define CONFIG_HSMMC2_8BIT
include/configs/opos6uldev.h +0 -2
@@ -59,8 +59,6 @@#endif /* Environment is stored in the eMMC boot partition */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1#define CONFIG_ENV_VERSION 100#define CONFIG_BOARD_NAME opos6ul
include/configs/origen.h +0 -1
@@ -77,7 +77,6 @@/* MIU (Memory Interleaving Unit) */ #define CONFIG_MIU_2BIT_21_7_INTERLEAVED -#define CONFIG_SYS_MMC_ENV_DEV 0#define RESERVE_BLOCK_SIZE (512)#define BL1_SIZE (16 << 10)/*16 K reserved for BL1*/
include/configs/p1_p2_rdb_pc.h +0 -1
@@ -697,7 +697,6 @@*/ #if defined(CONFIG_SDCARD )#define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_SYS_MMC_ENV_DEV 0#elif defined(CONFIG_MTD_RAW_NAND )#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)#ifdef CONFIG_TPL_BUILD
include/configs/p2371-0000.h +0 -2
@@ -18,8 +18,6 @@#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/p2371-2180.h +0 -2
@@ -18,8 +18,6 @@#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/p2571.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/p2771-0000.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2#define BOARD_EXTRA_ENV_SETTINGS \ "calculated_vars=kernel_addr_r fdt_addr_r scriptaddr pxefile_addr_r " \
include/configs/paz00.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_PAZ00/* Environment in eMMC,@the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2#include "tegra-common-post.h"
include/configs/pcl063_ull.h +0 -2
@@ -24,8 +24,6 @@/* Environment settings */ /* Environment in SD */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0#define MMC_ROOTFS_DEV 0#define MMC_ROOTFS_PART 2
include/configs/pcm052.h +0 -3
@@ -158,8 +158,5 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif #endif
include/configs/phycore_am335x_r2.h +0 -1
@@ -15,7 +15,6 @@#include <configs/ti_am335x_common.h> #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
include/configs/phycore_rk3288.h +0 -2
@@ -16,6 +16,4 @@ func(MMC, mmc, 0) \ func(MMC, mmc, 1) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#endif
include/configs/pico-imx6.h +0 -1
@@ -133,7 +133,6 @@* write the direct value here */ #define CONFIG_BOARD_SIZE_LIMIT 715776 -#define CONFIG_SYS_MMC_ENV_DEV 0/* Ethernet Configuration */ #define CONFIG_FEC_MXC
include/configs/pico-imx6ul.h +0 -4
@@ -144,10 +144,6 @@*/ #define CONFIG_BOARD_SIZE_LIMIT 715776 - -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0 -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO
include/configs/pico-imx7d.h +0 -3
@@ -166,9 +166,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0 -/* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/pico-imx8mq.h +0 -1
@@ -134,7 +134,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2"/* USDHC2 */ /* Size of malloc() pool */
include/configs/platinum.h +0 -1
@@ -77,7 +77,6 @@#else /* CONFIG_CMD_NAND */ /* Environment in MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* CONFIG_CMD_NAND */
include/configs/poplar.h +0 -3
@@ -51,9 +51,6 @@"ramdisk_addr_r=0x32400000\0" \BOOTENV - -#define CONFIG_SYS_MMC_ENV_DEV 0 - /* Monitor Command Prompt */#define CONFIG_SYS_CBSIZE 512#define CONFIG_SYS_MAXARGS 64
include/configs/popmetal_rk3288.h +0 -2
@@ -9,6 +9,4 @@#define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/puma_rk3399.h +0 -4
@@ -8,10 +8,6 @@#include <configs/rk3399_common.h> -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#endif -#define SDRAM_BANK_SIZE (2UL << 30)#define CONFIG_SERIAL_TAG
include/configs/rock.h +0 -2
@@ -9,6 +9,4 @@#define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3188_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/rock2.h +0 -2
@@ -13,6 +13,4 @@#include <configs/rk3288_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/rock960_rk3399.h +0 -2
@@ -13,8 +13,6 @@#include <configs/rk3399_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define SDRAM_BANK_SIZE (2UL << 30)#endif
include/configs/s32v234evb.h +0 -2
@@ -163,8 +163,6 @@/* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_BOOTP_BOOTFILESIZE
include/configs/s5p_goni.h +0 -1
@@ -162,7 +162,6 @@/* FLASH and environment organization */ #define CONFIG_MMC_DEFAULT_DEV 0 -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV#define CONFIG_ENV_OVERWRITE #define CONFIG_USE_ONENAND_BOARD_INIT
include/configs/s5pc210_universal.h +0 -2
@@ -53,8 +53,6 @@#define CONFIG_BOOTBLOCK "10"#define CONFIG_UBIBLOCK "9" -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_UBIFS_OPTION " rootflags=bulk_read,no_chk_data_crc "#define CONFIG_ENV_FLASHBOOT CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \ "${mtdparts}"
include/configs/salvator-x.h +0 -2
@@ -18,7 +18,5 @@#define COUNTER_FREQUENCY 0xFE502A/* 16.66MHz from CPclk */ /* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2#endif /* __SALVATOR_X_H */
include/configs/sc_sps_1.h +0 -3
@@ -21,9 +21,6 @@/* Environment */ /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET
include/configs/seaboard.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD/* Environment in eMMC,@the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* NAND support */ #define CONFIG_TEGRA_NAND
include/configs/secomx6quq7.h +0 -1
@@ -75,7 +75,6 @@/* Environment organization */ #if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0#define CONFIG_DYNAMIC_MMC_DEVNO #endif
include/configs/sheep_rk3368.h +0 -1
@@ -8,7 +8,6 @@#include <configs/rk3368_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0#define KERNEL_LOAD_ADDR 0x280000#define DTB_LOAD_ADDR 0x5600000#define INITRD_LOAD_ADDR 0x5bf0000
include/configs/sksimx6.h +0 -1
@@ -52,7 +52,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 1/* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* Default environment */ #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/smdkv310.h +0 -1
@@ -62,7 +62,6 @@/* MIU (Memory Interleaving Unit) */ #define CONFIG_MIU_2BIT_INTERLEAVED -#define CONFIG_SYS_MMC_ENV_DEV 0#define RESERVE_BLOCK_SIZE (512)#define BL1_SIZE (16 << 10)/*16 K reserved for BL1*/
include/configs/socfpga_common.h +0 -3
@@ -159,9 +159,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);*/ /* Environment for SDMMC boot */ -#if defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0/* device 0 */ -#endif /* Environment for QSPI boot */
include/configs/socfpga_soc64_common.h +0 -1
@@ -49,7 +49,6 @@/* * U-Boot environment configurations */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* device 0 */ /* * QSPI support
include/configs/somlabs_visionsom_6ull.h +0 -2
@@ -87,8 +87,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET )/* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 1/* USDHC2 */ -#define CONFIG_SYS_MMC_ENV_PART 0/* user area */ /* USB Configs */#ifdef CONFIG_CMD_USB
include/configs/sunxi-common.h +0 -2
@@ -136,10 +136,8 @@#if CONFIG_MMC_SUNXI_SLOT_EXTRA !=-1 /* If we have two devices (most likely eMMC + MMC), favour the eMMC */ -#define CONFIG_SYS_MMC_ENV_DEV 1#else /* Otherwise, use the only device we have */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif #define CONFIG_SYS_MMC_MAX_DEVICE 4#endif
include/configs/tbs2910.h +0 -2
@@ -66,8 +66,6 @@#endif /* CONFIG_CMD_USB */ /* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 2/* overwritten on SD boot */ -#define CONFIG_SYS_MMC_ENV_PART 1/* overwritten on SD boot */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BOARD_SIZE_LIMIT 392192/* (CONFIG_ENV_OFFSET - 1024) */
include/configs/tec-ng.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6
include/configs/tinker_rk3288.h +0 -2
@@ -22,6 +22,4 @@ func(PXE, pxe, na) \ func(DHCP, dchp, na) -#define CONFIG_SYS_MMC_ENV_DEV 1 -#endif
include/configs/titanium.h +0 -1
@@ -145,7 +145,6 @@#else /* CONFIG_CMD_NAND */ /* Environment in MMC */ -#define CONFIG_SYS_MMC_ENV_DEV 0#endif /* CONFIG_CMD_NAND */
include/configs/tqma6.h +0 -2
@@ -74,8 +74,6 @@#define TQMA6_UBOOT_SECTOR_START 0x2#define TQMA6_UBOOT_SECTOR_COUNT 0x7fe -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define TQMA6_FDT_OFFSET (2 * SZ_1M)#define TQMA6_FDT_SECTOR_START 0x1000#define TQMA6_FDT_SECTOR_COUNT 0x800
include/configs/trats.h +0 -2
@@ -46,8 +46,6 @@#define CONFIG_BOOTBLOCK "10"#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}" -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE /* Tizen - partitions definitions */
include/configs/trats2.h +0 -2
@@ -41,8 +41,6 @@#define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE /* Tizen - partitions definitions */
include/configs/ts4600.h +0 -3
@@ -23,9 +23,6 @@/* Environment */ /* Environment is in MMC */ -#if defined(CONFIG_CMD_MMC ) && defined(CONFIG_ENV_IS_IN_MMC ) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* Boot Linux */ #define CONFIG_LOADADDR 0x42000000
include/configs/ts4800.h +0 -2
@@ -133,6 +133,4 @@* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif
include/configs/udoo.h +0 -2
@@ -85,6 +85,4 @@/* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* __CONFIG_H * */
include/configs/udoo_neo.h +0 -1
@@ -22,7 +22,6 @@/* Command definition */ #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_SYS_MMC_ENV_DEV 0/*USDHC2*/ /* Linux only */ #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/ulcb.h +0 -2
@@ -18,7 +18,5 @@#define COUNTER_FREQUENCY 0xFE502A/* 16.66MHz from CPclk */ /* Environment in eMMC,@the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_SYS_MMC_ENV_PART 2#endif /* __ULCB_H */
include/configs/uniphier.h +0 -3
@@ -50,9 +50,6 @@/* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1 -#if !defined(CONFIG_ARM64 )/* Time clock 1MHz */ #define CONFIG_SYS_TIMER_RATE 1000000
include/configs/usbarmory.h +0 -1
@@ -15,7 +15,6 @@#include <asm/arch/imx-regs.h> /* U-Boot environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* U-Boot general configurations */ #define CONFIG_SYS_CBSIZE 512
include/configs/venice2.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/ventana.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA/* Environment in eMMC, at the end of 2nd "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2#include "tegra-common-post.h"
include/configs/verdin-imx8mm.h +0 -2
@@ -86,8 +86,6 @@#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_ENV_IS_IN_MMC )/* Environment in eMMC, before config block@the end of 1st "boot sector" */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC1 eMMC */ -#define CONFIG_SYS_MMC_ENV_PART 1#endif /* Size of malloc() pool */
include/configs/vf610twr.h +0 -4
@@ -176,10 +176,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif -#ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_RANGE (512 * 1024)#endif
include/configs/vining_2000.h +0 -2
@@ -78,9 +78,7 @@#define CONFIG_IMX6_PWM_PER_CLK 66000000#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC4 eMMC */ /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */ -#define CONFIG_SYS_MMC_ENV_PART 1/* boot0 */ #endif #ifdef CONFIG_SPL_BUILD
include/configs/vyasa-rk3288.h +0 -2
@@ -20,8 +20,6 @@#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ -#define CONFIG_SYS_MMC_ENV_DEV 1 -#ifndef CONFIG_TPL_BUILD #define CONFIG_SPL_OS_BOOT
include/configs/wandboard.h +0 -2
@@ -122,6 +122,4 @@/* Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif /* __CONFIG_H * */
include/configs/warp.h +0 -2
@@ -37,8 +37,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MMC_ENV_DEV 0 -/* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080
include/configs/warp7.h +0 -3
@@ -143,9 +143,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0 -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/xpress.h +0 -2
@@ -48,8 +48,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* Environment is in stored in the eMMC boot partition */ -#define CONFIG_SYS_MMC_ENV_DEV 0/* USDHC2 */ -#define CONFIG_SYS_MMC_ENV_PART 1/* boot parition */ #define CONFIG_MMCROOT "/dev/mmcblk0p2"/* USDHC2 */ /* USB Configs */
scripts/config_whitelist.txt +0 -2
@@ -3055,8 +3055,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR CONFIG_SYS_MMC_BASE CONFIG_SYS_MMC_CD_PIN CONFIG_SYS_MMC_CLK_OD -CONFIG_SYS_MMC_ENV_DEV -CONFIG_SYS_MMC_ENV_PART CONFIG_SYS_MMC_MAX_BLK_COUNT CONFIG_SYS_MMC_MAX_DEVICE CONFIG_SYS_MMC_U_BOOT_DST
Signature · 1 line
2.17.1
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PART
Yes, please! That's the only thing preventing us from running a vanilla upstream U-Boot on a number of our boards where we have the defconfig out of tree - we currently have a single patch touching a few config headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing a few folks.
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 12 lines
env/Kconfig +4
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is not inside the binary. Some systems need this and for the rest, it doesn't hurt. +config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \ + CMD_MVEBU_BUBT || FMAN_ENET || QE
Slight yuck. But I suppose that those (ab)uses of CONFIG_SYS_MMC_ENV_DEV can grow their own proper config symbols piecemeal and then get removed from that list, rather than having to wean off all of them before SYS_MMC_ENV_* can get converted.
Why is ENV_IS_IN_FAT in that list? That has its own already-existing ENV_FAT_DEVICE_AND_PART.
And a more general question: What does the SYS_ prefix mean? Some config symbols have it, but I can't find any pattern to it. (I don't mean it should be changed with this patch, but I'm curious if there is any tribal knowledge here that I should be aware of.)
Rasmus
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Hi Rasmus,
Quoted 36 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a vanilla upstream U-Boot on a number of our boards where we have the defconfig out of tree - we currently have a single patch touching a few config headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing a few folks.Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 12 lines
env/Kconfig +4
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is not inside the binary. Some systems need this and for the rest, it doesn't hurt. +config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \ + CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVcan grow their own proper config symbols piecemeal and then get removed from that list, rather than having to wean off all of them before SYS_MMC_ENV_* can get converted.
Quoted 7 lines
Why is
ENV_IS_IN_FATin that list? That has its own already-existingENV_FAT_DEVICE_AND_PART.And a more general question: What does the
SYS_prefix mean? Some config symbols have it, but I can't find any pattern to it. (I don't mean it should be changed with this patch, but I'm curious if there is any tribal knowledge here that I should be aware of.)
The SYS_ prefix dates back quite some time, most likely nearly to the beginning of U-Boot or more precise PPCBoot then. Here an extract from the README:
* Configuration _OPTIONS_:
These are selectable by the user and have names beginning with "CONFIG_".
* Configuration _SETTINGS_:
These depend on the hardware etc. and should not be meddled with if you don't know what you're doing; they have names beginning with "CONFIG_SYS_".
Its most likely outdated by now, as this naming convention has not been followed in the last years, AFAICT.
Thanks,
Stefan
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 40 lines · Stefan Roese
Hi Rasmus,
Quoted 37 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a vanilla upstream U-Boot on a number of our boards where we have the defconfig out of tree - we currently have a single patch touching a few config headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing a few folks.Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 572
Quoted 11 lines
env/Kconfig +4
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is not inside the binary. Some systems need this and for the rest, it doesn't hurt. +config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \ + CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVcan grow their own proper config symbols piecemeal and then get removed from that list, rather than having to wean off all of them before SYS_MMC_ENV_* can get converted.Why is
ENV_IS_IN_FATin that list? That has its own already-existingENV_FAT_DEVICE_AND_PART.
ENV_IS_IN_FAT is in the list because with 6731bef6966e ("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we can pick
up the device dynamically and hard-code the partition. But that in turn
means needing a default device. This even gets expanded to cover ext4
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
Quoted 13 lines
Quoted 4 lines
And a more general question: What does the
SYS_prefix mean? Some config symbols have it, but I can't find any pattern to it. (I don't mean it should be changed with this patch, but I'm curious if there is any tribal knowledge here that I should be aware of.)The
SYS_prefix dates back quite some time, most likely nearly to the beginning of U-Boot or more precise PPCBoot then. Here an extract from the README:* Configuration _OPTIONS_:
These are selectable by the user and have names beginning with "CONFIG_".
Quoted 7 lines
* Configuration _SETTINGS_:
These depend on the hardware etc. and should not be meddled with if you don't know what you're doing; they have names beginning with "CONFIG_SYS_".Its most likely outdated by now, as this naming convention has not been followed in the last years, AFAICT.
Thanks for explaining.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200805/900e2a3d/attachment.sig>
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 52 lines · Tom Rini
Quoted 9 lines · Stefan Roese
Hi Rasmus,
Quoted 6 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a
vanilla
Quoted 1 line
Quoted 1 line
upstream U-Boot on a number of our boards where we have the
defconfig
Quoted 1 line
Quoted 1 line
out of tree - we currently have a single patch touching a few
config
Quoted 7 lines
Quoted 7 lines
headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing a fewfolks.
Quoted 9 lines
Quoted 9 lines
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 567
Quoted 6 lines
env/Kconfig +0
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is notinside
Quoted 1 line
Quoted 1 line
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 568
Quoted 1 line
env/Kconfig +0
-0the binary. Some systems need this and for the rest, itdoesn't hurt.
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR
Quoted 3 lines
env/Kconfig +3
-0+config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT ||
SYS_LS_PPA_FW_IN_MMC|| \Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 1 line
env/Kconfig +1
-0+ CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVQuoted 1 line
Quoted 1 line
can grow their own proper config symbols piecemeal and then get
removed
Quoted 4 lines
Quoted 4 lines
from that list, rather than having to wean off all of them before SYS_MMC_ENV_* can get converted.
Why is
ENV_IS_IN_FATin that list? That has its ownalready-existing
Quoted 1 line
Quoted 1 line
ENV_FAT_DEVICE_AND_PART.
Quoted 7 lines
ENV_IS_IN_FATis in the list because with6731bef6966e("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we can pick
up the device dynamically and hard-code the partition. But that in
turn
means needing a default device. This even gets expanded to cover ext4
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
FAT and ext4 don't need to grow their own config symbols because they already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
If someone is setting up the ENV_FAT_DEVICE_AND_PART to start with a colon and thus abdicate the device part, but then that decision is only coming from a hard-coded SYS_MMC_ENV_DEV option, then they're probably somewhat confused.
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 64 lines · David Woodhouse
Quoted 52 lines · Tom Rini
Quoted 9 lines · Stefan Roese
Hi Rasmus,
Quoted 6 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a
vanilla
Quoted 1 line
Quoted 1 line
upstream U-Boot on a number of our boards where we have the
defconfig
Quoted 1 line
Quoted 1 line
out of tree - we currently have a single patch touching a few
config
Quoted 7 lines
Quoted 7 lines
headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing a fewfolks.
Quoted 9 lines
Quoted 9 lines
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 567
Quoted 6 lines
env/Kconfig +0
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is notinside
Quoted 1 line
Quoted 1 line
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 568
Quoted 1 line
env/Kconfig +0
-0the binary. Some systems need this and for the rest, itdoesn't hurt.
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR
Quoted 3 lines
env/Kconfig +3
-0+config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT ||
SYS_LS_PPA_FW_IN_MMC|| \Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 1 line
env/Kconfig +1
-0+ CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVQuoted 1 line
Quoted 1 line
can grow their own proper config symbols piecemeal and then get
removed
Quoted 4 lines
Quoted 4 lines
from that list, rather than having to wean off all of them before SYS_MMC_ENV_* can get converted.
Why is
ENV_IS_IN_FATin that list? That has its ownalready-existing
Quoted 1 line
Quoted 1 line
ENV_FAT_DEVICE_AND_PART.Quoted 7 lines
ENV_IS_IN_FATis in the list because with6731bef6966e("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we can pick
up the device dynamically and hard-code the partition. But that in
turn
means needing a default device. This even gets expanded to cover ext4
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
Quoted 3 lines
FAT and ext4 don't need to grow their own config symbols because they already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with a colon and thus abdicate the device part, but then that decision is only coming from a hard-codedSYS_MMC_ENV_DEVoption, then they're probably somewhat confused.
Right, but the default mmc_get_env_dev() you added uses CONFIG_SYS_MMC_ENV_DEV.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200805/52d5d80a/attachment.sig>
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 77 lines · Tom Rini
Quoted 17 lines · David Woodhouse
Quoted 14 lines · Tom Rini
Quoted 9 lines · Stefan Roese
Hi Rasmus,
Quoted 6 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a
vanilla
Quoted 1 line
Quoted 1 line
upstream U-Boot on a number of our boards where we have the
defconfig
Quoted 1 line
Quoted 1 line
out of tree - we currently have a single patch touching a few
Quoted 8 lines
Quoted 8 lines
config
Quoted 7 lines
Quoted 7 lines
headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing afew
Quoted 17 lines
Quoted 17 lines
folks.
Quoted 9 lines
Quoted 9 lines
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 567
Quoted 6 lines
env/Kconfig +0
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is notinside
Quoted 1 line
Quoted 1 line
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 568
Quoted 1 line
env/Kconfig +0
-0the binary. Some systems need this and for the rest, itdoesn't hurt.
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR
Quoted 3 lines
env/Kconfig +3
-0+config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT ||
SYS_LS_PPA_FW_IN_MMC|| \Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 1 line
env/Kconfig +1
-0+ CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVQuoted 1 line
Quoted 1 line
can grow their own proper config symbols piecemeal and then get
removed
Quoted 1 line
Quoted 1 line
from that list, rather than having to wean off all of them
before
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
SYS_MMC_ENV_* can get converted.
Why is
ENV_IS_IN_FATin that list? That has its ownalready-existing
Quoted 1 line
Quoted 1 line
ENV_FAT_DEVICE_AND_PART.
ENV_IS_IN_FATis in the list because with6731bef6966e("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we canpick
Quoted 3 lines
Quoted 3 lines
up the device dynamically and hard-code the partition. But that in turn
means needing a default device. This even gets expanded to coverext4
Quoted 6 lines
Quoted 1 line
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
FAT and ext4 don't need to grow their own config symbols because they
already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with acolon and thus abdicate the device part, but then that decision is only coming from a hard-coded
SYS_MMC_ENV_DEVoption, then they're probably somewhat confused.Right, but the default
mmc_get_env_dev()you added usesCONFIG_SYS_MMC_ENV_DEV.
Sure. But any time that default actually gets invoked, the config is entirely pointless and meets that "probably somewhat confused" definition above.
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
In reply to Tom RiniQuoted 77 lines · Tom Rini
Quoted 17 lines · David Woodhouse
Quoted 14 lines · Tom Rini
Quoted 9 lines · Stefan Roese
Hi Rasmus,
Quoted 6 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a
vanilla
Quoted 1 line
Quoted 1 line
upstream U-Boot on a number of our boards where we have the
defconfig
Quoted 1 line
Quoted 1 line
out of tree - we currently have a single patch touching a few
Quoted 8 lines
Quoted 8 lines
config
Quoted 7 lines
Quoted 7 lines
headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing afew
Quoted 17 lines
Quoted 17 lines
folks.
Quoted 9 lines
Quoted 9 lines
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 567
Quoted 6 lines
env/Kconfig +0
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is notinside
Quoted 1 line
Quoted 1 line
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 568
Quoted 1 line
env/Kconfig +0
-0the binary. Some systems need this and for the rest, itdoesn't hurt.
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR
Quoted 3 lines
env/Kconfig +3
-0+config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT ||
SYS_LS_PPA_FW_IN_MMC|| \Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 573
Quoted 1 line
env/Kconfig +1
-0+ CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVQuoted 1 line
Quoted 1 line
can grow their own proper config symbols piecemeal and then get
removed
Quoted 1 line
Quoted 1 line
from that list, rather than having to wean off all of them
before
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
SYS_MMC_ENV_* can get converted.
Why is
ENV_IS_IN_FATin that list? That has its ownalready-existing
Quoted 1 line
Quoted 1 line
ENV_FAT_DEVICE_AND_PART.
ENV_IS_IN_FATis in the list because with6731bef6966e("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we canpick
Quoted 3 lines
Quoted 3 lines
up the device dynamically and hard-code the partition. But that in turn
means needing a default device. This even gets expanded to coverext4
Quoted 6 lines
Quoted 1 line
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
FAT and ext4 don't need to grow their own config symbols because they
already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with acolon and thus abdicate the device part, but then that decision is only coming from a hard-coded
SYS_MMC_ENV_DEVoption, then they're probably somewhat confused.Right, but the default
mmc_get_env_dev()you added usesCONFIG_SYS_MMC_ENV_DEV.
Perhaps I could revamp the FAT/ext4 patches so that they don't use the default weak function, and if you use the "get it at runtime" behaviour on any build which doesn't actually have a real platform mmc_get_env_dev() function, the build fails. That would be sane, but might involve a separate explicit config option instead of just "the DEVICE_AND_PART option starts with a colon".
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 79 lines · David Woodhouse
Quoted 78 lines · Tom Rini
Quoted 17 lines · David Woodhouse
Quoted 14 lines · Tom Rini
Quoted 9 lines · Stefan Roese
Hi Rasmus,
Quoted 6 lines · Rasmus Villemoes
Quoted 3 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTYes, please! That's the only thing preventing us from running a
vanilla
Quoted 1 line
Quoted 1 line
upstream U-Boot on a number of our boards where we have the
defconfig
Quoted 1 line
Quoted 1 line
out of tree - we currently have a single patch touching a few
Quoted 8 lines
Quoted 8 lines
config
Quoted 7 lines
Quoted 7 lines
headers.
Quoted 5 lines
Cc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Due to some non-environment usage of the variables, cc'ing afew
Quoted 17 lines
Quoted 17 lines
folks.
Quoted 9 lines
Quoted 9 lines
Yes, and those are the reason I didn't already send a patch.
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 567
Quoted 6 lines
env/Kconfig +0
-0@@ -567,6 +567,25 @@ config SYS_RELOC_GD_ENV_ADDR Relocate the early env_addr pointer so we know it is notinside
Quoted 1 line
Quoted 1 line
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 568
Quoted 1 line
env/Kconfig +0
-0the binary. Some systems need this and for the rest, itdoesn't hurt.
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 571
Quoted 3 lines
env/Kconfig +3
-0+config SYS_MMC_ENV_DEV + int "mmc device number" + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT ||
SYS_LS_PPA_FW_IN_MMC|| \Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
env/Kconfig config SYS_RELOC_GD_ENV_ADDR · line 572
Quoted 1 line
env/Kconfig +1
-0+ CMD_MVEBU_BUBT || FMAN_ENET || QESlight yuck. But I suppose that those (ab)uses of
CONFIG_SYS_MMC_ENV_DEVQuoted 1 line
Quoted 1 line
can grow their own proper config symbols piecemeal and then get
removed
Quoted 1 line
Quoted 1 line
from that list, rather than having to wean off all of them
before
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
SYS_MMC_ENV_* can get converted.
Why is
ENV_IS_IN_FATin that list? That has its ownalready-existing
Quoted 1 line
Quoted 1 line
ENV_FAT_DEVICE_AND_PART.
ENV_IS_IN_FATis in the list because with6731bef6966e("env/fat.c:
allow loading from a FAT partition on the MMC boot device") we canpick
Quoted 3 lines
Quoted 3 lines
up the device dynamically and hard-code the partition. But that in turn
means needing a default device. This even gets expanded to coverext4
Quoted 6 lines
Quoted 1 line
here:
http://patchwork.ozlabs.org/project/uboot/patch/20200804090547.2175076-2-dwmw2 at infradead.org/
FAT and ext4 don't need to grow their own config symbols because they
already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
Quoted 2 lines
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with a
Quoted 8 lines
Quoted 6 lines
colon and thus abdicate the device part, but then that decision is only coming from a hard-coded
SYS_MMC_ENV_DEVoption, then they're probably somewhat confused.Right, but the default
mmc_get_env_dev()you added usesCONFIG_SYS_MMC_ENV_DEV.Perhaps I could revamp the FAT/ext4 patches so that they don't use the default weak function, and if you use the "get it at runtime" behaviour on any build which doesn't actually have a real platform
mmc_get_env_dev()function, the build fails. That would be sane, but might involve a separate explicit config option instead of just "theDEVICE_AND_PARToption starts with a colon".
That sounds like a good idea, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200805/fd1a6c92/attachment.sig>
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 16 lines · Tom Rini
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
FAT and ext4 don't need to grow their own config symbols because they
already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
Quoted 2 lines
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with acolon and thus abdicate the device part, but then that decision is only coming from a hard-coded
SYS_MMC_ENV_DEVoption, then they're probably somewhat confused.Right, but the default
mmc_get_env_dev()you added usesCONFIG_SYS_MMC_ENV_DEV.
Quoted 8 lines
Quoted 1 line
Perhaps I could revamp the FAT/ext4 patches so that they don't use
the default weak function, and if you use the "get it at runtime" behaviour on any build which doesn't actually have a real platform
mmc_get_env_dev()function, the build fails. That would be sane, but might involve a separate explicit config option instead of just "theDEVICE_AND_PARToption starts with a colon".That sounds like a good idea, thanks!
Hm. I took a quick look at this. Forgetting my ext4 patch for the moment and looking just at what's in HEAD...
The initial na?ve approach is to rip out the weak implementation of mmc_get_env_dev() from env/fat.c and trust the compiler spot that this is tautologically false because the strings are constants:
part_str = CONFIG_ENV_FAT_DEVICE_AND_PART;
if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc") &&
part_str[0] == ':') {Sadly, GCC doesn't seem to be clever enough for that.
So the actual code for env_fat_device_and_part() would need some extra compile-time conditional.
It would be possible to make platforms with their own 'real' mmc_get_env_dev() function select a config symbol called something like (imaginatively) PLATFORM_HAS_MMC_GET_ENV_DEV, and then the code in env_fat_device_and_part() could be conditional on that as well as CONFIG_MMC as it is at the moment.
On the whole though, it seems like overkill just to "forbid" a mildly pointless combination of config options. And in fact, perhaps it isn't even that pointless.
I wrote the "find environment FAT partition using mmc_get_env_dev()" support for OpenWrt, specifically on the mt7623 platforms where it is indeed a runtime choice. But it's actually quite sensible for OpenWrt just to have a consistent partition layout across multiple devices, set CONFIG_ENV_FAT_DEVICE_AND_PART to ":2" on *all* of those platforms, and then *only* CONFIG_SYS_MMC_ENV_DEV needs to vary in a platform-specific manner.
I think the best option is probably to consolidate and move the weak mmc_get_env_dev() into drivers/mmc/mmc.c and let env/{fat,ext4,mmc}.c use it from there.
Yes, some people might be able to set CONFIG_ENV_FAT_DEVICE_AND_PART to something starting with a colon, deferring the device number to a hard- coded CONFIG_SYS_MMC_ENV_DEV ? which at *runtime* is kind of redundant. But that isn't actually all that insane anyway. We don't *need* to forbid it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5174 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200814/64b18324/attachment.bin>
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
Quoted 65 lines · David Woodhouse
Quoted 16 lines · Tom Rini
Quoted 16 lines
Quoted 15 lines
Quoted 2 lines
FAT and ext4 don't need to grow their own config symbols because they
already *have* them. The only reason they're involved here is because of the case where they explicitly want to *abdicate* responsibility and let platform code determine the device to use, not hard-coded config. Like the MT7623 platforms where the preloader tells U-Boot if it was actually loaded from the internal eMMC or external SD card.
Quoted 2 lines
If someone is setting up the
ENV_FAT_DEVICE_AND_PARTto start with acolon and thus abdicate the device part, but then that decision is only coming from a hard-coded
SYS_MMC_ENV_DEVoption, then they're probably somewhat confused.Right, but the default
mmc_get_env_dev()you added usesCONFIG_SYS_MMC_ENV_DEV.Quoted 8 lines
Quoted 1 line
Perhaps I could revamp the FAT/ext4 patches so that they don't use
the default weak function, and if you use the "get it at runtime" behaviour on any build which doesn't actually have a real platform
mmc_get_env_dev()function, the build fails. That would be sane, but might involve a separate explicit config option instead of just "theDEVICE_AND_PARToption starts with a colon".That sounds like a good idea, thanks!
Hm. I took a quick look at this. Forgetting my ext4 patch for the moment and looking just at what's in HEAD...
The initial na?ve approach is to rip out the weak implementation of
mmc_get_env_dev()fromenv/fat.cand trust the compiler spot that this is tautologically false because the strings are constants:part_str = CONFIG_ENV_FAT_DEVICE_AND_PART; if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc") && part_str[0] == ':') {Sadly, GCC doesn't seem to be clever enough for that.
So the actual code for
env_fat_device_and_part()would need some extra compile-time conditional.It would be possible to make platforms with their own 'real'
mmc_get_env_dev()function select a config symbol called something like (imaginatively)PLATFORM_HAS_MMC_GET_ENV_DEV, and then the code inenv_fat_device_and_part()could be conditional on that as well asCONFIG_MMCas it is at the moment.On the whole though, it seems like overkill just to "forbid" a mildly pointless combination of config options. And in fact, perhaps it isn't even that pointless.
I wrote the "find environment FAT partition using
mmc_get_env_dev()" support for OpenWrt, specifically on the mt7623 platforms where it is indeed a runtime choice. But it's actually quite sensible for OpenWrt just to have a consistent partition layout across multiple devices, setCONFIG_ENV_FAT_DEVICE_AND_PARTto ":2" on *all* of those platforms, and then *only*CONFIG_SYS_MMC_ENV_DEVneeds to vary in a platform-specific manner.I think the best option is probably to consolidate and move the weak
mmc_get_env_dev()intodrivers/mmc/mmc.cand letenv/{fat,ext4,mmc}.cuse it from there.
Quoted 5 lines
Yes, some people might be able to set
CONFIG_ENV_FAT_DEVICE_AND_PARTto something starting with a colon, deferring the device number to a hard- codedCONFIG_SYS_MMC_ENV_DEV? which at *runtime* is kind of redundant. But that isn't actually all that insane anyway. We don't *need* to forbid it.
Sounds like a good plan to me!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200814/dc5558fd/attachment.sig>
PATCH 1/1 Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig
In reply to Tom RiniQuoted 7 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PARTCc Priyanka Jain <[email protected]>Cc Madalin Bucur <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200808/b77201d4/attachment.sig>