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

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

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 47aec5f06c1c355a0ec821de9af3b6f3d85be38b..27539d27d723a5cb7034ed7f265f0af51e409f3b 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -59,7 +59,6 @@
  */
 
 #define CONFIG_405EP           1       /* This is a PPC405 CPU         */
-#define CONFIG_4xx             1       /* ...member of PPC4xx family   */
 #define CONFIG_PPCHAMELEONEVB  1       /* ...on a PPChameleonEVB board */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFFB0000      /* Reserve 320 kB for Monitor */
@@ -154,7 +153,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
-#define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt       */
 
 #define        CONFIG_SYS_HUSH_PARSER                  /* use "hush" command parser    */
 
@@ -185,8 +183,6 @@
 #define CONFIG_SYS_LOAD_ADDR   0x100000        /* default load address */
 #define CONFIG_SYS_EXTBDINFO   1               /* To use extended board_into (bd_t) */
 
-#define CONFIG_SYS_HZ          1000            /* decrementer freq: 1 ms ticks */
-
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 
 /*-----------------------------------------------------------------------