Merge git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / include / configs / omap3_igep00x0.h

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 70d337e6f16660d0f9f009af034f494d234bed23..a029b54804d730f897254d8c2743f3da271f4ff4 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -11,7 +11,6 @@
 #define __IGEP00X0_H
 
 #define CONFIG_NR_DRAM_BANKS            2
-#define CONFIG_NAND
 
 #include <configs/ti_omap3_common.h>
 #include <asm/mach-types.h>
@@ -37,11 +36,6 @@
 #endif
 #endif
 
-/* GPIO banks */
-#define CONFIG_OMAP3_GPIO_3            /* GPIO64 .. 95 is in GPIO bank 3 */
-#define CONFIG_OMAP3_GPIO_5            /* GPIO128..159 is in GPIO bank 5 */
-#define CONFIG_OMAP3_GPIO_6            /* GPIO160..191 is in GPIO bank 6 */
-
 /* USB */
 #define CONFIG_USB_MUSB_UDC            1
 #define CONFIG_USB_OMAP3               1
@@ -57,9 +51,6 @@
 #define CONFIG_USBD_MANUFACTURER       "Texas Instruments"
 #define CONFIG_USBD_PRODUCT_NAME       "IGEP"
 
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_ONENAND
-
 #ifndef CONFIG_SPL_BUILD
 
 /* Environment */
@@ -94,7 +85,6 @@
 #define CONFIG_SMC911X_BASE            0x2C000000
 #endif /* (CONFIG_CMD_NET) */
 
-#define CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_SYS_MTDPARTS_RUNTIME
 
@@ -140,7 +130,6 @@
 #define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
 
 /* environment organization */
-#define CONFIG_ENV_IS_NOWHERE          1
 #define CONFIG_ENV_UBI_PART            "UBI"
 #define CONFIG_ENV_UBI_VOLUME          "config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND   "config_r"