Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 6295ec505f8dbfdc4cd9aa8aae953751892f2c59..04433edcc543c6fba908294bcfcb2d3e27e4df40 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -29,21 +29,24 @@
 
 #define CONFIG_REVISION_TAG            1
 
-/* Status LED */
+/* Status LED available for IGEP0020 and IGEP0030 but not IGEP0032 */
+#if (CONFIG_MACH_TYPE != MACH_TYPE_IGEP0032)
 #define CONFIG_STATUS_LED
 #define CONFIG_BOARD_SPECIFIC_LED
 #define CONFIG_GPIO_LED
 #if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
 #define RED_LED_GPIO 27
-#endif
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
+#elif (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
 #define RED_LED_GPIO 16
+#else
+#error "status LED not defined for this machine."
 #endif
 #define RED_LED_DEV                            0
 #define STATUS_LED_BIT                 RED_LED_GPIO
 #define STATUS_LED_STATE               STATUS_LED_ON
 #define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
 #define STATUS_LED_BOOT                        RED_LED_DEV
+#endif
 
 /* GPIO banks */
 #define CONFIG_OMAP3_GPIO_3            /* GPIO64 .. 95 is in GPIO bank 3 */
@@ -51,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
 
@@ -72,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*/
 
@@ -192,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