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

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

diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 1d031f1..ae567a3 100644 (file)
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -48,7 +48,6 @@
 #define        CONFIG_DK1S10           1               /* Stratix DK-1S10 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*/
 
 /*------------------------------------------------------------------------
@@ -545,14 +544,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       ""
 */