Commit 903e779c5537e1c87470f911a178e4463984e562

Authored by Otavio Salvador
Committed by Stefano Babic
1 parent a2ac1b3a7d

mx6qsabreauto: Change mmcroot so it works out of box

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>

Showing 3 changed files with 4 additions and 2 deletions Side-by-side Diff

include/configs/mx6qsabre_common.h
... ... @@ -86,7 +86,7 @@
86 86 "initrd_high=0xffffffff\0" \
87 87 "mmcdev=0\0" \
88 88 "mmcpart=1\0" \
89   - "mmcroot=/dev/mmcblk1p2 rootwait rw rootwait rw\0" \" \
  89 + "mmcroot=" CONFIG_MMCROOT " rootwait rw rootwait rw\0" \" \
90 90 "mmcargs=setenv bootargs console=${console},${baudrate} " \
91 91 "root=${mmcroot}\0" \
92 92 "loadbootscript=" \
include/configs/mx6qsabreauto.h
1 1 /*
2 2 * Copyright (C) 2012 Freescale Semiconductor, Inc.
3 3 *
4   - * Configuration settings for the Freescale i.MX6Q SabreSD board.
  4 + * Configuration settings for the Freescale i.MX6Q SabreAuto board.
5 5 *
6 6 * This program is free software; you can redistribute it and/or
7 7 * modify it under the terms of the GNU General Public License as
... ... @@ -15,6 +15,7 @@
15 15 #define CONFIG_MACH_TYPE 3529
16 16 #define CONFIG_MXC_UART_BASE UART4_BASE
17 17 #define CONFIG_CONSOLE_DEV "ttymxc3"
  18 +#define CONFIG_MMCROOT "/dev/mmcblk0p2"
18 19 #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
19 20  
20 21 #include "mx6qsabre_common.h"
include/configs/mx6qsabresd.h
... ... @@ -20,6 +20,7 @@
20 20 #define CONFIG_MACH_TYPE 3980
21 21 #define CONFIG_MXC_UART_BASE UART1_BASE
22 22 #define CONFIG_CONSOLE_DEV "ttymxc0"
  23 +#define CONFIG_MMCROOT "/dev/mmcblk1p2"
23 24 #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
24 25  
25 26 #include "mx6qsabre_common.h"