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

[u-boot] / include / configs / mcx.h

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index c2b16316f11dd666de039b8c4598c22a8d06be20..5e27ab2e4cfc49c2fd33b5b2a5dbcf2d8e50e18c 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -16,6 +16,7 @@
 #define CONFIG_OMAP34XX                        /* which is a 34XX */
 #define CONFIG_OMAP3_MCX               /* working with mcx */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define MACH_TYPE_MCX                  3656
 #define CONFIG_MACH_TYPE       MACH_TYPE_MCX
@@ -408,7 +409,6 @@
 #define CONFIG_DRIVER_TI_EMAC
 #define CONFIG_DRIVER_TI_EMAC_USE_RMII
 #define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME