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

[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 a5e7d8f6a41ae256f32c8aebd9605ae02816edf1..04433edcc543c6fba908294bcfcb2d3e27e4df40 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -54,7 +54,7 @@
 #define CONFIG_OMAP3_GPIO_6            /* GPIO160..191 is in GPIO bank 6 */
 
 /* USB */
-#define CONFIG_MUSB_UDC                        1
+#define CONFIG_USB_MUSB_UDC                    1
 #define CONFIG_USB_OMAP3               1
 #define CONFIG_TWL4030_USB             1
 
@@ -75,11 +75,9 @@
 #endif
 #if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) || \
     (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0032)
-#define CONFIG_CMD_NET         /* bootp, tftpboot, rarpboot    */
 #endif
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS         /* NFS support                  */
 
 /*#undef CONFIG_ENV_IS_NOWHERE*/
 
@@ -195,7 +193,7 @@
 
 /* NAND boot config */
 #ifdef CONFIG_NAND
-#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     64
 #define CONFIG_SYS_NAND_PAGE_SIZE      2048