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

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

diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index d5eba587e443c9314a938c1b6d878d1fc88e9880..3f4e0734ab6ae056dcb1efb20165ad07dab895d7 100644 (file)
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -39,7 +39,6 @@
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768   /* 32.768 kHz crystal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK     16000000/* 16.0 MHz crystal */
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq */
 
 /* Misc CPU related */
 #define CONFIG_SKIP_LOWLEVEL_INIT
@@ -243,7 +242,6 @@
 
 #endif
 
-#define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \