Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / include / configs / eco5pk.h

diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 13fde39..a75932f 100644 (file)
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -15,10 +15,6 @@
 
 #include "tam3517-common.h"
 
-#undef CONFIG_USB_EHCI_HCD
-#undef CONFIG_USB_EHCI_OMAP
-#undef CONFIG_USB_OMAP3
-
 /* Our console port is port3 */
 #undef CONFIG_CONS_INDEX
 #undef CONFIG_SYS_NS16550_COM1
@@ -36,12 +32,6 @@
 /*
  * Set its own mtdparts, different from common
  */
-#undef MTDIDS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#define MTDIDS_DEFAULT         "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:512k(xloader-nand)," \
-                               "1024k(uboot-nand),256k(params-nand)," \
-                               "5120k(kernel),-(ubifs)"
 
 /*
  * The arithmetic in tam3517.h is wrong for us and the kernel gets overwritten.
@@ -53,7 +43,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS       CONFIG_TAM3517_SETTINGS \
        "install_kernel=if dhcp $bootfile; then nand erase kernel;" \
                                "nand write $fileaddr kernel; fi\0" \
-       "mtdparts="MTDPARTS_DEFAULT"\0" \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \
        "serverip=192.168.142.60\0"
 
 #endif /* __CONFIG_H */