xpedite1k: Remove CONFIG_SYS_DRAM_TEST support

[oweals/u-boot.git] / include / configs / at91sam9260ek.h

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index b6e2edf3135dc5ed872482d41ee4d3dc06ecbca1..6cee59368ceb194c55a9ff0c56463c86f7f2037f 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -29,15 +29,13 @@
 
 /* ARM asynchronous clock */
 #define AT91_MAIN_CLOCK                18432000        /* 18.432 MHz crystal */
-#define CONFIG_SYS_HZ          1000000         /* 1us resolution */
+#define CONFIG_SYS_HZ          1000
 
 #define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
 
 #ifdef CONFIG_AT91SAM9G20EK
-#define AT91_CPU_NAME          "AT91SAM9G20"
 #define CONFIG_AT91SAM9G20     1       /* It's an Atmel AT91SAM9G20 SoC*/
 #else
-#define AT91_CPU_NAME          "AT91SAM9260"
 #define CONFIG_AT91SAM9260     1       /* It's an Atmel AT91SAM9260 SoC*/
 #endif
 
@@ -124,6 +122,8 @@
 #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
+
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
 #endif
 
 /* NOR flash - no real flash on this board */
@@ -207,7 +207,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */