Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / DK1C20.h

diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index 6fdc566..cdc488b 100644 (file)
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -50,7 +50,6 @@
 #define        CONFIG_DK1C20           1               /* Cyclone DK-1C20 board*/
 #define CONFIG_SYS_CLK_FREQ    CONFIG_SYS_NIOS_CPU_CLK/* 50 MHz core clock     */
 #define        CONFIG_SYS_HZ                   1000            /* 1 msec time tick     */
-#undef  CONFIG_SYS_CLKS_IN_HZ
 #define        CONFIG_BOARD_EARLY_INIT_F 1     /* enable early board-spec. init*/
 
 /*------------------------------------------------------------------------
@@ -233,15 +232,17 @@
        /********************************************/
        /* !!! CS8900 is __not__ tested on NIOS !!! */
        /********************************************/
-#define        CONFIG_DRIVER_CS8900                    /* Using CS8900         */
-#define        CS8900_BASE             (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
+#define CONFIG_NET_MULTI
+#define        CONFIG_CS8900           /* Using CS8900         */
+#define        CONFIG_CS8900_BASE      (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
+                               CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
 
 #if    (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
-#undef CS8900_BUS16
-#define        CS8900_BUS32            1
+#undef CONFIG_CS8900_BUS16
+#define        CONFIG_CS8900_BUS32
 #else  /* no */
-#define        CS8900_BUS16            1
-#undef CS8900_BUS32
+#define        CONFIG_CS8900_BUS16
+#undef CONFIG_CS8900_BUS32
 #endif
 
 #else
@@ -539,14 +540,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV               "nor0"
 #define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET       0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT         ""
 #define MTDPARTS_DEFAULT       ""
 */