Merge branch 'master' of ../work into next

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

diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index efd4214d910dd36d9c2af3c5166a169d7fe66944..fdfa022c0b0d3e3c7f18d415ee32b5d26d4b904c 100644 (file)
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -47,13 +47,15 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_CS8900   1       /* we have a CS8900 on-board */
-#define CS8900_BASE            0x20000000
-#define CS8900_BUS32           1
+#define CONFIG_NET_MULTI
+#define CONFIG_CS8900          /* we have a CS8900 on-board */
+#define CONFIG_CS8900_BASE     0x20000000
+#define CONFIG_CS8900_BUS32
 
 /*
  * select serial console configuration
  */
+#define CONFIG_CLPS7111_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
 /* allow to overwrite serial and ethaddr */