X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Ftegra-common-post.h;h=fae0e761fb425380f2895150a08fa42595fa8697;hb=5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035;hp=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hpb=1703fbefd9183fffd76f4744a73f5ca9daef6313;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index e54428b..fae0e76 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -21,12 +21,14 @@
 #define CONFIG_SYS_NONCACHED_MEMORY	(1 << 20)	/* 1 MiB */
 
 #ifndef CONFIG_SPL_BUILD
+#ifndef BOOT_TARGET_DEVICES
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
+#endif
 #include <config_distro_bootcmd.h>
 #else
 #define BOOTENV
@@ -40,7 +42,6 @@
 
 #ifdef CONFIG_USB_KEYBOARD
 #define STDIN_KBD_USB ",usbkbd"
-#define CONFIG_PREBOOT			"usb start"
 #else
 #define STDIN_KBD_USB ""
 #endif