From f3c2190ab21bfa4b5532b0f476cea401bd3de37a Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 23 Feb 2016 14:42:36 +0800 Subject: MLK-12436-4: mx6qarm2: update board header Define CONFIG_MMCROOT, CONFIG_SYS_MMC_ENV_PART to align with imx_v2016.03. Signed-off-by: Peng Fan (cherry picked from commit b06ddb7a09346bf21028a239e77d5bf92469a284) Signed-off-by: Ye Li --- include/configs/mx6qarm2.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 1db70ce..9aa3a73 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -37,9 +37,9 @@ "initrd_high=0xffffffff\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" \ @@ -126,6 +126,8 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ +#define CONFIG_MMCROOT "/dev/mmcblk3p2" /* SDHC4 */ /* USB Configs */ #ifdef CONFIG_CMD_USB -- cgit v1.1