diff mbox series

[4/6] udoo: Adjust the SD card device numbering

Message ID 20211218211025.770362-4-festevam@gmail.com
State Accepted
Delegated to: Stefano Babic
Headers show
Series [1/6] udoo_spl: Initialize the eSDHC controller in SPL | expand

Commit Message

Fabio Estevam Dec. 18, 2021, 9:10 p.m. UTC
After the conversion to DM the SD card shows up as 'mmc 2'
device.

Adjust the 'mmcdev' and the distro command 'func' accordingly.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 configs/udoo_defconfig | 1 +
 include/configs/udoo.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Peter Robinson Dec. 21, 2021, 9:52 a.m. UTC | #1
On Sat, Dec 18, 2021 at 9:10 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> After the conversion to DM the SD card shows up as 'mmc 2'
> device.
>
> Adjust the 'mmcdev' and the distro command 'func' accordingly.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
> ---
>  configs/udoo_defconfig | 1 +
>  include/configs/udoo.h | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
> index 8e1bba112041..284ea0588465 100644
> --- a/configs/udoo_defconfig
> +++ b/configs/udoo_defconfig
> @@ -35,6 +35,7 @@ CONFIG_OF_CONTROL=y
>  CONFIG_ENV_OVERWRITE=y
>  CONFIG_ENV_IS_IN_MMC=y
>  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=2
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
>  CONFIG_BOUNCE_BUFFER=y
> diff --git a/include/configs/udoo.h b/include/configs/udoo.h
> index fe6ea68dd461..4bddc0eca30e 100644
> --- a/include/configs/udoo.h
> +++ b/include/configs/udoo.h
> @@ -28,7 +28,7 @@
>         "fdt_addr=0x18000000\0" \
>         "fdt_addr_r=0x18000000\0" \
>         "ip_dyn=yes\0" \
> -       "mmcdev=0\0" \
> +       "mmcdev=2\0" \
>         "mmcrootfstype=ext4\0" \
>         "findfdt="\
>                 "if test ${board_rev} = MX6Q; then " \
> @@ -44,7 +44,7 @@
>         BOOTENV
>
>  #define BOOT_TARGET_DEVICES(func) \
> -       func(MMC, mmc, 0) \
> +       func(MMC, mmc, 2) \
>         func(SATA, sata, 0) \
>         func(DHCP, dhcp, na)
>
> --
> 2.25.1
>
Tom Rini Jan. 9, 2022, 1:27 a.m. UTC | #2
On Sat, Dec 18, 2021 at 06:10:23PM -0300, Fabio Estevam wrote:

> After the conversion to DM the SD card shows up as 'mmc 2'
> device.
> 
> Adjust the 'mmcdev' and the distro command 'func' accordingly.
> 
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
index 8e1bba112041..284ea0588465 100644
--- a/configs/udoo_defconfig
+++ b/configs/udoo_defconfig
@@ -35,6 +35,7 @@  CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_BOUNCE_BUFFER=y
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index fe6ea68dd461..4bddc0eca30e 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -28,7 +28,7 @@ 
 	"fdt_addr=0x18000000\0" \
 	"fdt_addr_r=0x18000000\0" \
 	"ip_dyn=yes\0" \
-	"mmcdev=0\0" \
+	"mmcdev=2\0" \
 	"mmcrootfstype=ext4\0" \
 	"findfdt="\
 		"if test ${board_rev} = MX6Q; then " \
@@ -44,7 +44,7 @@ 
 	BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \
-	func(MMC, mmc, 0) \
+	func(MMC, mmc, 2) \
 	func(SATA, sata, 0) \
 	func(DHCP, dhcp, na)