Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

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

diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index ad9c77e..3dcea0b 100644 (file)
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -16,7 +16,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300    1
-#define CONFIG_MPC83xx 1
 #define CONFIG_MPC837x 1
 #define CONFIG_MPC8377 1
 
@@ -361,13 +360,11 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_LOAD_ADDR   0x2000000
 #define CONFIG_LOADADDR                0x4000000
-#define CONFIG_SYS_PROMPT      "=> "
 #define CONFIG_SYS_CBSIZE      256
 
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS     16
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_HZ          1000
 
 #define CONFIG_LOADS_ECHO              1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1