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

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

[Fabio Estevam]

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

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 include/configs/mx6cuboxi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 55717c77ab38..1a06f29b8c17 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -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

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

[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.

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

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 include/configs/mx6cuboxi.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 1a06f29b8c17..9e5083b0d876 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -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

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

[Peter Robinson]

On Mon, Jul 19, 2021 at 9:15 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> 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?

> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
>  include/configs/mx6cuboxi.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index 55717c77ab38..1a06f29b8c17 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -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
>

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

[Peter Robinson]

On Mon, Jul 19, 2021 at 9:15 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> 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?

> cat /proc/cmdline
> root=PARTUUID=00000000-01 rootwait rw console=ttymxc0,115200,115200
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
>  include/configs/mx6cuboxi.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index 1a06f29b8c17..9e5083b0d876 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -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
>