Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index b466513ea3c84ab06ae31761d20017a7a5f66f10..6416ad522701bd1a6f8b07ccdf1709f566d66794 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -19,7 +19,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU        */
 #define CONFIG_PM826           1       /* ...on a PM8260 module        */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
@@ -168,7 +167,6 @@
  * Miscellaneous configurable options
  */
 #define        CONFIG_SYS_LONGHELP                     /* undef to save memory         */
-#define        CONFIG_SYS_PROMPT       "=> "           /* Monitor Command Prompt       */
 #if defined(CONFIG_CMD_KGDB)
 #define        CONFIG_SYS_CBSIZE       1024            /* Console I/O Buffer Size      */
 #else
@@ -183,8 +181,6 @@
 
 #define        CONFIG_SYS_LOAD_ADDR    0x100000        /* default load address */
 
-#define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
-
 #define        CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC     /* "bad" address                */
 
 /*