Skip to contentSkip to conversation

mx6cuboxi: Fix the mmc device for the rootfs

PATCH In review Fabio Estevam 2 participants 4 messages Jul 19, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mx6cuboxi: Fix the mmc device for the rootfs

After the conversion to DM_MMC, the rootfs becomes mmc 1, so adjust it accordingly.

---
 include/configs/mx6cuboxi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6cuboxi.h +1 -1
index 55717c77ab38..1a06f29b8c17 100644
@@ -57,7 +57,7 @@
 	"console=" CONSOLE_DEV ",115200\0" \
 	"bootm_size=0x10000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	"finduuid=part uuid mmc 0:1 uuid\0" \
+	"finduuid=part uuid mmc 1:1 uuid\0" \
 	"update_sd_firmware=" \
 		"if test ${ip_dyn} = yes; then " \
 			"setenv get_cmd dhcp; " \
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 mx6cuboxi: Fix the console variable

Do not pass the console baudrate to the 'console' variable to avoid the baudrate being passed twice when extlinux.conf contains the standard: console=${console},${baudrate} format.

cat /proc/cmdline
root=PARTUUID=00000000-01 rootwait rw console=ttymxc0,115200,115200

---
 include/configs/mx6cuboxi.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/configs/mx6cuboxi.h +1 -2
index 1a06f29b8c17..9e5083b0d876 100644
@@ -38,7 +38,6 @@
 /* Command definition */
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONSOLE_DEV	"ttymxc0"
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -54,7 +53,7 @@
 	"ramdiskaddr=0x13000000\0" \
 	"initrd_high=0xffffffff\0" \
 	"ip_dyn=yes\0" \
-	"console=" CONSOLE_DEV ",115200\0" \
+	"console=ttymxc0\0" \
 	"bootm_size=0x10000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 	"finduuid=part uuid mmc 1:1 uuid\0" \
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 2/2] mx6cuboxi: Fix the console variable

Quoted 4 lines · Fabio Estevam

Do not pass the console baudrate to the 'console' variable to avoid the baudrate being passed twice when extlinux.conf contains the standard: console=${console},${baudrate} format.

Maybe we could deal with this using the stdout-path method in DT?

Quoted 32 lines

cat /proc/cmdline
root=PARTUUID=00000000-01 rootwait rw console=ttymxc0,115200,115200

---
 include/configs/mx6cuboxi.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/configs/mx6cuboxi.h +1 -3
index 1a06f29b8c17..9e5083b0d876 100644
@@ -38,7 +38,6 @@
 /* Command definition */
 
 #define CONFIG_MXC_UART_BASE   UART1_BASE
-#define CONSOLE_DEV    "ttymxc0"
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -54,7 +53,7 @@
        "ramdiskaddr=0x13000000\0" \
        "initrd_high=0xffffffff\0" \
        "ip_dyn=yes\0" \
-       "console=" CONSOLE_DEV ",115200\0" \
+       "console=ttymxc0\0" \
        "bootm_size=0x10000000\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "finduuid=part uuid mmc 1:1 uuid\0" \
--

2.25.1

#3 lore raw
In reply to Fabio Estevam
Quoted 3 lines · Fabio Estevam

After the conversion to DM_MMC, the rootfs becomes mmc 1, so adjust it accordingly.

Should this be fixed with an alias in the dts, what's now on mmc 0?

Quoted 21 lines
---
 include/configs/mx6cuboxi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/mx6cuboxi.h +1 -2
index 55717c77ab38..1a06f29b8c17 100644
@@ -57,7 +57,7 @@
        "console=" CONSOLE_DEV ",115200\0" \
        "bootm_size=0x10000000\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "finduuid=part uuid mmc 0:1 uuid\0" \
+       "finduuid=part uuid mmc 1:1 uuid\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
                        "setenv get_cmd dhcp; " \
--

2.25.1