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

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

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 8d3ff6aab7eac4d30b00103e08ae78712362fa57..29c32fee5178060965cd87992c178ec7ccaad7b2 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -9,7 +9,7 @@
  * Philippe Robin, <philippe.robin@arm.com>
  * Configuration for Versatile PB.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -25,12 +25,11 @@
 
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         0x10000000
-#define CONFIG_SYS_HZ                  (1000000 / 256)
-#define CONFIG_SYS_TIMERBASE           0x101E2000      /* Timer 0 and 1 base */
 
-#define CONFIG_SYS_TIMER_INTERVAL      10000
-#define CONFIG_SYS_TIMER_RELOAD                (CONFIG_SYS_TIMER_INTERVAL >> 4)
-#define CONFIG_SYS_TIMER_CTRL          0x84            /* Enable, Clock / 16 */
+#define CONFIG_SYS_TIMERBASE           0x101E2000      /* Timer 0 and 1 base */
+#define CONFIG_SYS_TIMER_RATE          (1000000 / 256)
+#define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMERBASE + 0x4)
+#define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /*
  * control registers
@@ -102,7 +101,8 @@
 
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_BOOTARGS                "root=/dev/nfs mem=128M ip=dhcp "\
-                               "netdev=25,0,0xf1010000,0xf1010010,eth0"
+                               "netdev=25,0,0xf1010000,0xf1010010,eth0 "\
+                               "console=ttyAMA0,38400n1"
 
 /*
  * Static configuration when assigning fixed address