Patchwork [U-Boot] mx6qsabreauto: Change mmcroot so it works out of box

login
register
mail settings
Submitter Otavio Salvador
Date Oct. 2, 2012, 7:22 p.m.
Message ID <1349205730-19174-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/188648/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Oct. 2, 2012, 7:22 p.m.
The mmcroot setting vary between mx6qsabreauto and mx6qsabresd so we
move this to the board configuration file.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/mx6qsabre_common.h |    2 +-
 include/configs/mx6qsabreauto.h    |    3 ++-
 include/configs/mx6qsabresd.h      |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
Fabio Estevam - Oct. 2, 2012, 7:51 p.m.
On Tue, Oct 2, 2012 at 4:22 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> The mmcroot setting vary between mx6qsabreauto and mx6qsabresd so we
> move this to the board configuration file.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
Stefano Babic - Oct. 10, 2012, 12:03 p.m.
On 02/10/2012 21:22, Otavio Salvador wrote:
> The mmcroot setting vary between mx6qsabreauto and mx6qsabresd so we
> move this to the board configuration file.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied to u-boot-imx, next branch, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index 247e8d6..e25e943 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -86,7 +86,7 @@ 
 	"initrd_high=0xffffffff\0" \
 	"mmcdev=0\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
+	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index a878dec..760f3ce 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -1,7 +1,7 @@ 
 /*
  * Copyright (C) 2012 Freescale Semiconductor, Inc.
  *
- * Configuration settings for the Freescale i.MX6Q SabreSD board.
+ * Configuration settings for the Freescale i.MX6Q SabreAuto board.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,6 +15,7 @@ 
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
 
 #include "mx6qsabre_common.h"
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index f2ce79e..771d129 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -20,6 +20,7 @@ 
 #define CONFIG_MACH_TYPE	3980
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc0"
+#define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 #include "mx6qsabre_common.h"