summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-03-10 18:50:51 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-03-10 18:50:51 +0100
commit48eadbd80208cb54f4ac7aec2c0cdcb6967777b0 (patch)
tree459bbe43fcf7201696808370900967df00ab74ac
parent76aefe208e6a16f4c37e9fcd8d67ec6da392fece (diff)
boot: try emmcboot, nfsboot, then commandline
change the bootcommand to the following boot order - emmcboot - nfsboot - enable usb keyboard and go to command prompt
-rw-r--r--board/toradex/apalis_imx6/apalis_imx6.c1
-rw-r--r--include/configs/apalis-imx6.h8
2 files changed, 5 insertions, 4 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index a8376226e0..1175c91d94 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -265,6 +265,7 @@ int board_ehci_hcd_init(int port)
mdelay(2);
/* Set MXM USBH power enable */
gpio_set_value(IMX_GPIO_NR(3, 28), 1);
+ mdelay(100);
return 0;
}
diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h
index 6e60d50ac4..2b3919ffd6 100644
--- a/include/configs/apalis-imx6.h
+++ b/include/configs/apalis-imx6.h
@@ -194,10 +194,10 @@
"fatload mmc 1:1 10800000 uImage && bootm 10800000"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "bootcmd=run emmcboot ; "\
- "setenv stdout serial,vga ; " \
- "echo ; echo emmcboot failed ; " \
- "run nfsboot\0" \
+ "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
+ "run nfsboot ; echo ; echo nfsboot failed ; " \
+ "usb start ;" \
+ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
"bootscript=fatload mmc 1:1 10008000 6x_bootscript && source 10008000\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off vmalloc=400M\0" \