Patchwork [U-Boot] mx6qsabresd: Fix booting the kernel from SDHC3

login
register
mail settings
Submitter Fabio Estevam
Date Jan. 10, 2013, 4:02 p.m.
Message ID <1357833766-11042-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/211075/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - Jan. 10, 2013, 4:02 p.m.
commit 49ea0ff5 (mx6qsabresd: use on-board eMMC to store environment) broke 
booting a uImage from SDHC3.

Adapt the default environment to use CONFIG_SYS_MMC_ENV_DEV as the correct mmc
node for loading the kernel, since mmcdev should not be harcoded to zero.

While at it, go back to using SDHC3 as default mmc, since we have Yocto images
that generate an SD card containing U-boot,kernel and rootfs, so it is more 
convenient to keep using SDHC3 as it was originally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 include/configs/mx6qsabre_common.h |    2 +-
 include/configs/mx6qsabresd.h      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Otavio Salvador - Jan. 10, 2013, 4:12 p.m.
On Thu, Jan 10, 2013 at 2:02 PM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> commit 49ea0ff5 (mx6qsabresd: use on-board eMMC to store environment) broke
> booting a uImage from SDHC3.
>
> Adapt the default environment to use CONFIG_SYS_MMC_ENV_DEV as the correct mmc
> node for loading the kernel, since mmcdev should not be harcoded to zero.
>
> While at it, go back to using SDHC3 as default mmc, since we have Yocto images
> that generate an SD card containing U-boot,kernel and rootfs, so it is more
> convenient to keep using SDHC3 as it was originally.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  include/configs/mx6qsabre_common.h |    2 +-
>  include/configs/mx6qsabresd.h      |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
> index bd2fb10..5d03b3d 100644
> --- a/include/configs/mx6qsabre_common.h
> +++ b/include/configs/mx6qsabre_common.h
> @@ -86,7 +86,7 @@
>         "console=" CONFIG_CONSOLE_DEV "\0" \
>         "fdt_high=0xffffffff\0"   \
>         "initrd_high=0xffffffff\0" \
> -       "mmcdev=0\0" \
> +       "mmcdev=CONFIG_SYS_MMC_ENV_DEV\0" \

I think you need to split the string so the macro is expanded. as:
    "mmcdev=" CONFIG_SYS_MMC_ENV_DEV "\0" \

On am I missing something?

>         "mmcpart=1\0" \
>         "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>         "mmcargs=setenv bootargs console=${console},${baudrate} " \
> diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
> index a1d9285..ccb7751 100644
> --- a/include/configs/mx6qsabresd.h
> +++ b/include/configs/mx6qsabresd.h
> @@ -27,7 +27,7 @@
>
>  #define CONFIG_SYS_FSL_USDHC_NUM       3
>  #if defined(CONFIG_ENV_IS_IN_MMC)
> -#define CONFIG_SYS_MMC_ENV_DEV         2       /* eMMC/uSDHC4 */
> +#define CONFIG_SYS_MMC_ENV_DEV         1       /* SDHC3 */
>  #define CONFIG_SYS_MMC_ENV_PART                1       /* Boot partition 1 */
>  #endif
>
> --
> 1.7.9.5
>
>



--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index bd2fb10..5d03b3d 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -86,7 +86,7 @@ 
 	"console=" CONFIG_CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
-	"mmcdev=0\0" \
+	"mmcdev=CONFIG_SYS_MMC_ENV_DEV\0" \
 	"mmcpart=1\0" \
 	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index a1d9285..ccb7751 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -27,7 +27,7 @@ 
 
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 #if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV		2	/* eMMC/uSDHC4 */
+#define CONFIG_SYS_MMC_ENV_DEV		1	/* SDHC3 */
 #define CONFIG_SYS_MMC_ENV_PART		1	/* Boot partition 1 */
 #endif