exynos: config: Move common options to the common headers and tidy up

[karo-tx-uboot.git] / include / configs / odroid_xu3.h

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index cf17f3d06e9cb3b237f9181e7c43747347ef156c..0deff460267f8f0571eded73475e0281e7cec513 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -9,7 +9,9 @@
 #define __CONFIG_ODROID_XU3_H
 
 #include "exynos5420-common.h"
+#include <configs/exynos5-common.h>
 
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_PROMPT              "ODROID-XU3 # "
 #define CONFIG_IDENT_STRING            " for ODROID-XU3"
 
@@ -60,10 +62,10 @@
 #define CONFIG_G_DNL_VENDOR_NUM                0x04E8
 #define CONFIG_G_DNL_PRODUCT_NUM       0x6601
 #define CONFIG_G_DNL_MANUFACTURER      "Samsung"
-#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_DOWNLOAD
 
 /* DFU */
-#define CONFIG_DFU_FUNCTION
+#define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_MMC
 #define CONFIG_CMD_DFU
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_32M
@@ -72,13 +74,13 @@
 /* THOR */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM   CONFIG_G_DNL_VENDOR_NUM
 #define CONFIG_G_DNL_THOR_PRODUCT_NUM  0x685D
-#define CONFIG_THOR_FUNCTION
+#define CONFIG_USB_FUNCTION_THOR
 #define CONFIG_CMD_THOR_DOWNLOAD
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
-#define CONFIG_USB_GADGET_MASS_STORAGE
+#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */