From: Jagan Teki <jagan@amarulasolutions.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 26/53] env: sunxi: Update default env fat device
Date: Fri, 10 Aug 2018 11:36:44 +0530 [thread overview]
Message-ID: <20180810060711.6547-27-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20180810060711.6547-1-jagan@amarulasolutions.com>
Usually eMMC is default env fat device for environment,
if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc
device as 1. but with DM_MMC it can be more possible to
probe eMMC as device 2 since for most of the sunxi platforms
eMMC is configured mmc2.
So update the env default device as 2 if DM_MMC and
MMC_SUNXI_SLOT_EXTRA != 1 but some boards may not use all
possible mmc devices or partly disabled in DT, for those update
the device in board specific defconfig.
Cc: Olliver Schinagl <oliver@schinagl.nl>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Marcus Cooper <codekipper@gmail.com>
Cc: Stefan Mavrodiev <stefan@olimex.com>
Cc: Paul Kocialkowski <contact@paulk.fr>
Cc: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 +
configs/A20-OLinuXino_MICRO_defconfig | 1 +
configs/A20-Olimex-SOM-EVB_defconfig | 1 +
configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
configs/Mele_M3_defconfig | 1 +
configs/Orangepi_mini_defconfig | 1 +
configs/Sinlinx_SinA33_defconfig | 1 +
configs/Yones_Toptech_BD1078_defconfig | 1 +
configs/amarula_a64_relic_defconfig | 1 +
env/Kconfig | 3 ++-
11 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index 8cedf9cf24..bc5820263c 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB0_VBUS_PIN="PC17"
CONFIG_USB0_VBUS_DET="PH5"
CONFIG_I2C1_ENABLE=y
diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
index f7e7cbab0a..1552960d88 100644
--- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig
+++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_I2C1_ENABLE=y
CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8"
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 8dcbdc08f9..b5f1b7efe2 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC3_CD_PIN="PH11"
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_I2C1_ENABLE=y
CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8"
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index a06499e2d0..58f6fbad91 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC3_CD_PIN="PH0"
CONFIG_MMC3_PINS="PH"
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_USB0_VBUS_DET="PH5"
CONFIG_SATAPWR="PC3"
diff --git a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
index 3bb8c4c7e6..ac4f841c4e 100644
--- a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
+++ b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB0_VBUS_PIN="PC17"
CONFIG_USB0_VBUS_DET="PH5"
CONFIG_I2C1_ENABLE=y
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 22497aaeb4..bc447a4a90 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_VIDEO_VGA=y
CONFIG_VIDEO_COMPOSITE=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 7eeae25010..cfab739552 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23"
CONFIG_MMC0_CD_PIN="PH10"
CONFIG_MMC3_CD_PIN="PH11"
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB1_VBUS_PIN="PH26"
CONFIG_USB2_VBUS_PIN="PH22"
CONFIG_VIDEO_COMPOSITE=y
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 80741b58f9..2d7b295188 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552
CONFIG_DRAM_ZQ=15291
CONFIG_MMC0_CD_PIN="PB4"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB0_ID_DET="PH8"
CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
CONFIG_VIDEO_LCD_DCLK_PHASE=0
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index c49cbcbc3c..cad5618d54 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_MMC1_CD_PIN="PH2"
CONFIG_MMC1_PINS="PH"
CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
CONFIG_AXP_GPIO=y
diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig
index caeb3f6008..bb5c0ff7b2 100644
--- a/configs/amarula_a64_relic_defconfig
+++ b/configs/amarula_a64_relic_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN50I=y
CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_DRAM_ODT_EN=y
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto"
# CONFIG_VIDEO_DE2 is not set
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/env/Kconfig b/env/Kconfig
index be99efb937..99577f1b2e 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -374,7 +374,8 @@ config ENV_FAT_DEVICE_AND_PART
default "0:1" if TI_COMMON_CMD_OPTIONS
default "0:auto" if ARCH_ZYNQMP
default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
- default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+ default "1:auto" if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+ default "2:auto" if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
default "0" if ARCH_AT91
help
Define this to a string to specify the partition of the device. It can
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2018-08-10 6:06 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 6:06 [U-Boot] [PATCH v2 00/53] clk: Add Allwinner CLK, RESET support Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 01/53] clk: Kconfig: Ascending order to sub directiory kconfigs Jagan Teki
2018-08-13 10:34 ` Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 02/53] clk: Add Allwinner A64 CLK driver Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 03/53] reset: Add default request ops Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 04/53] reset: Add Allwinner RESET driver Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 05/53] clk: sunxi: Add Allwinner H3/H5 CLK driver Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 06/53] clk: sunxi: Add Allwinner A10/A20 " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 07/53] clk: sunxi: Add Allwinner A10s/A13 " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 08/53] clk: sunxi: Add Allwinner A31 " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 09/53] clk: sunxi: Add Allwinner A23 " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 10/53] clk: sunxi: a23: Add CLK support for A33 Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 11/53] clk: sunxi: Add Allwinner A83T CLK driver Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 12/53] clk: sunxi: Add Allwinner R40 " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 13/53] clk: sunxi: Add Allwinner V3S " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 14/53] sunxi: Enable CLK Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 15/53] musb-new: sunxi: Use CLK and RESET support Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 16/53] phy: sun4i-usb: " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 17/53] sunxi: usb: Switch to Generic host controllers Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 18/53] usb: host: Drop [e-o]hci-sunxi drivers Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 19/53] clk: sunxi: Implement AHB bus MMC clocks Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 20/53] clk: sunxi: Implement direct " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 21/53] clk: sunxi: Implement AHB bus MMC resets Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 22/53] reset: Add get reset by name optionally Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 23/53] reset: Add reset valid Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 24/53] dm: mmc: sunxi: Add CLK and RESET support Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 25/53] fastboot: sunxi: Update fastboot mmc default device Jagan Teki
2018-08-10 6:06 ` Jagan Teki [this message]
2018-08-10 6:06 ` [U-Boot] [PATCH v2 27/53] sunxi: Use mmc_bootdev=2 for MMC2 boot Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 28/53] sunxi: A20: Enable DM_MMC Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 29/53] mmc: sunxi: Add mmc, emmc H5/A64 compatible Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 30/53] sunxi: H3_H5: Enable DM_MMC Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 31/53] sunxi: A64: " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 32/53] mmc: sunxi: Add A83T emmc compatible Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 33/53] sunxi: A83T: Enable DM_MMC Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 34/53] sunxi: V40: " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 35/53] sunxi: A13/A31: " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 36/53] sunxi: A23/A33/V3S: " Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 37/53] clk: sunxi: Implement SPI clocks Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 38/53] clk: sunxi: Implement SPI resets Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 39/53] spi: sun4i: Add CLK support Jagan Teki
2018-08-10 6:06 ` [U-Boot] [PATCH v2 40/53] spi: Add Allwinner A31 SPI driver Jagan Teki
2018-08-11 0:38 ` Fahad Sadah
2018-08-10 6:06 ` [U-Boot] [PATCH v2 41/53] clk: sunxi: Implement UART clocks Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 42/53] clk: sunxi: Implement UART resets Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 43/53] clk: sunxi: Implement Ethernet clocks Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 44/53] clk: sunxi: Implement Ethernet resets Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 45/53] net: sunxi_emac: Add CLK support Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 46/53] net: sun8i_emac: Retrieve GMAC clock via 'syscon' phandle Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 47/53] net: sun8i_emac: Add CLK and RESET support Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 48/53] clk: Get the CLK by index without device Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 49/53] clk: Use clk_get_by_index_tail() Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 50/53] reset: Get the RESET by index without device Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 51/53] clk: sunxi: h3: Implement EPHY CLK and RESET Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 52/53] net: sun8i_emac: Add EPHY CLK and RESET support Jagan Teki
2018-08-10 6:07 ` [U-Boot] [PATCH v2 53/53] board: sunxi: gmac: Remove Ethernet clock and reset Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180810060711.6547-27-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox