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

[oweals/u-boot.git] / include / configs / ZUMA.h

diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 08c4ced1c9879ff0094397943988eb84a3d7434b..fcc47a99ec302245b80974b666855726f0fd3a7f 100644 (file)
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -130,7 +130,7 @@
  *
  */
 /* 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
@@ -138,7 +138,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT         "nor1=zuma-1,nor2=zuma-2"
 #define MTDPARTS_DEFAULT       "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)"
 */
@@ -164,9 +164,7 @@
 
 #define CONFIG_SYS_HZ                  1000            /* decr freq: 1ms ticks */
 
-#define CONFIG_SYS_BUS_HZ              133000000       /* 133 MHz              */
-
-#define CONFIG_SYS_BUS_CLK             CONFIG_SYS_BUS_HZ
+#define CONFIG_SYS_BUS_CLK             133000000       /* 133 MHz              */
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }