aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobie Basak <robie.basak@ubuntu.com>2012-02-16 09:02:17 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-02-16 09:02:17 -0700
commitbb846a8e56d8cd72cca9ac4977c043b2b888c5a4 (patch)
tree53823318c5a334226dcd38069295a498bde2e902
parentf31796bb61b5152f592ee5619e4d728ff0a21931 (diff)
downloadu-boot-linaro-stable-bb846a8e56d8cd72cca9ac4977c043b2b888c5a4.tar.gz
OMAP4: Force PXE booting when booting via spl-usb2012.02.1
So we don't use boot script on MMC/SD card. Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--include/configs/omap4_common.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index aa8e148ef..ea2447fb7 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -182,6 +182,14 @@
"ramdisk_addr_r=0x81600000\0" \
"pxefile_addr_r=0x86000000\0"
+#ifdef CONFIG_SPL_USB
+ "if usb start; then " \
+ "set autoload no; "\
+ "bootp; "\
+ "pxe get;" \
+ "pxe boot;" \
+ "fi"
+#else
#define CONFIG_PREBOOT \
"echo checking for ${preenv};" \
"if mmc rescan ${mmcdev}; then " \
@@ -219,6 +227,7 @@
"pxe get;" \
"pxe boot;" \
"fi"
+#endif
#define CONFIG_AUTO_COMPLETE 1