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

[people/ms/u-boot.git] / include / configs / afeb9260.h

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index de938f7a29169a2fcb1fa21d0a4669fa08f6bb23..58b8c8c39581ceaaa607775bc736f6f232488749 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -28,14 +28,11 @@
 
 /* ARM asynchronous clock */
 #define AT91_MAIN_CLOCK                18429952        /* from 18.432 MHz crystal */
-#define AT91_MASTER_CLOCK      89999598        /* peripheral = main / 2 */
-#define CONFIG_SYS_AT91_PLLB   0x107c3e18      /* PLLB settings for USB */
-#define CONFIG_SYS_HZ          1000000         /* 1us resolution */
-
-#define AT91_SLOW_CLOCK                32768   /* slow clock */
+#define CONFIG_SYS_HZ          1000
 
 #define CONFIG_AT91SAM9260     1       /* It's an Atmel AT91SAM9260 SoC*/
 #define CONFIG_AFEB9260                1       /* on an AFEB9260 Board */
+#define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 
 #define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs      */
@@ -109,6 +106,7 @@
 #define CONFIG_SYS_NAND_MASK_CLE               (1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PC13
+
 #endif
 
 /* NOR flash - no real flash on this board */
@@ -162,7 +160,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */