From bb846a8e56d8cd72cca9ac4977c043b2b888c5a4 Mon Sep 17 00:00:00 2001
From: Robie Basak <robie.basak@ubuntu.com>
Date: Thu, 16 Feb 2012 09:02:17 -0700
Subject: OMAP4: Force PXE booting when booting via spl-usb

So we don't use boot script on MMC/SD card.

Signed-off-by: John Rigby <john.rigby@linaro.org>
---
 include/configs/omap4_common.h | 9 +++++++++
 1 file changed, 9 insertions(+)

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
 
-- 
cgit v1.2.3