diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-26 19:25:09 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-30 11:31:43 +0800 |
| commit | 7feb8533f52677f641e3ff88a996cd3f1f722708 (patch) | |
| tree | f70c5bb35d29dc63b94bdafeee31cd723c516b0e /include/configs/mx6slevk.h | |
| parent | 987c48c07c9ef62fa3fe55faa6f7369b30637127 (diff) | |
| download | u-boot-imx-7feb8533f52677f641e3ff88a996cd3f1f722708.zip u-boot-imx-7feb8533f52677f641e3ff88a996cd3f1f722708.tar.gz u-boot-imx-7feb8533f52677f641e3ff88a996cd3f1f722708.tar.bz2 | |
ENGR00320125 iMX6: Change to use dynamical mmcroot
The kernel changes to fix the mmcblk index with USDHC controllers
as below:
mmcblk0 ---> USDHC1
mmcblk1 ---> USDHC2
mmcblk2 ---> USDHC3
mmcblk3 ---> USDHC4
So in u-boot, the "mmcroot" must be updated together.
When booting from SD/MMC device, change the "mmcroot" to
dynamically set according to the boot USDHC controller.
It is the same mechanism as "mmcdev" used for kernel image loading.
Therefore, the uboot, kernel image, dtb and rootfs are required
in same SD/MMC card.
To disable the mmc dynamical detection, set the "mmcautodetect" to "no",
then "mmcroot" and "mmcdev" will not be overwritten.
When booting from other devices which needs to load kernel, dtb and
rootfs from SD/MMC card, their "mmcdev" reset vaule is
CONFIG_SYS_MMC_ENV_DEV and "mmcroot" reset value is CONFIG_MMCROOT.
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include/configs/mx6slevk.h')
| -rw-r--r-- | include/configs/mx6slevk.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 84078c1..f46fca8 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -120,9 +120,10 @@ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ - "mmcdev=1\0" \ + "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ @@ -221,8 +222,9 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE SZ_8K -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ +#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #if defined CONFIG_SYS_BOOT_SPINOR #define CONFIG_SYS_USE_SPINOR |