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

[karo-tx-uboot.git] / include / configs / cm41xx.h

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 5454c2e5bdb608e56b9c5648f8736795495ffc3b..dca7d54c6b5525145789bc56fb5183898bd7512f 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -43,7 +43,6 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
@@ -53,6 +52,7 @@
  * select serial console configuration
  */
 #define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_KS8695_SERIAL
 #define        CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
@@ -73,7 +73,7 @@
  */
 #include <config_cmd_default.h>
 
-#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_SAVEENV
 
 
 #define CONFIG_BOOTDELAY       0
@@ -93,8 +93,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x00800000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x01000000      /* 16 MB in DRAM        */
 
-#undef CONFIG_SYS_CLKS_IN_HZ           /* everything, incl board info, in Hz */
-
 #define CONFIG_SYS_LOAD_ADDR           0x00008000      /* default load address */
 
 #define CONFIG_SYS_HZ                  (1000)          /* 1ms resolution ticks */