summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-02-07 17:08:02 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-02-07 17:08:02 +0100
commitd412d4118bec6cf403bc3bc399afc8b749fde8bd (patch)
treeb6fb58c4de524bb98272d851302f54b3a19bed46
parent7c91fb402a57eb030821bee04a2235e6e33b723f (diff)
config: account for changed mmc order
-rw-r--r--include/configs/apalis-imx6.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h
index dac959d1d6..d4199ed7b8 100644
--- a/include/configs/apalis-imx6.h
+++ b/include/configs/apalis-imx6.h
@@ -178,7 +178,7 @@
"setenv bootargs ${defargs} ${mmcargs} ${setupargs} " \
"${vidargs};" \
"echo Booting from internal eMMC chip...; " \
- "fatload mmc 1:1 10800000 uImage && bootm 10800000"
+ "fatload mmc 0:1 10800000 uImage && bootm 10800000"
#define NFS_BOOTCMD \
"run setup; " \
"setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
@@ -190,14 +190,14 @@
"setenv bootargs ${defargs} ${mmcargs} ${setupargs} " \
"${vidargs};" \
"echo Booting from SD card in 8bit slot...; " \
- "fatload mmc 0:1 10800000 uImage && bootm 10800000"
+ "fatload mmc 1:1 10800000 uImage && bootm 10800000"
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootcmd=run emmcboot ; "\
"setenv stdout serial,vga ; " \
"echo ; echo emmcboot failed ; " \
"usb start; setenv stdin serial,usbkbd\0" \
- "bootscript=fatload mmc 0:1 10008000 6x_bootscript && source 10008000\0" \
+ "bootscript=fatload mmc 1:1 10008000 6x_bootscript && source 10008000\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off vmalloc=400M\0" \
"emmcboot=" EMMC_BOOTCMD "\0" \
@@ -263,7 +263,7 @@
#if defined(CONFIG_ENV_IS_IN_MMC)
#define CONFIG_ENV_OFFSET (512 * 1024)
-#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
#define CONFIG_OF_LIBFDT