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

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

diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 0d3acf61ae271b9c838c8e19d779599ba2c24417..b4fda767310e88c0e18c68cf2a234dd8d8583e1e 100644 (file)
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -26,6 +26,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_AT91_LEGACY
+
 #ifdef CONFIG_CPUAT91_RAM
 #define CONFIG_SKIP_LOWLEVEL_INIT      1
 #define CONFIG_SKIP_RELOCATE_UBOOT     1
@@ -128,7 +130,13 @@
 #define CONFIG_SYS_MEMTEST_END                 \
        (CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 512 * 1024)
 
-#define CONFIG_DRIVER_ETHER                    1
+#define CONFIG_NET_MULTI               1
+#ifdef CONFIG_NET_MULTI
+#define CONFIG_DRIVER_AT91EMAC         1
+#define CONFIG_SYS_RX_ETH_BUFFER       8
+#else
+#define CONFIG_DRIVER_ETHER            1
+#endif
 #define CONFIG_NET_RETRY_COUNT                 20
 #define CONFIG_AT91C_USE_RMII                  1
 #define CONFIG_PHY_ADDRESS                     (1 << 5)
@@ -189,8 +197,8 @@
 #define CONFIG_SILENT_CONSOLE          1
 
 #define CONFIG_AUTOBOOT_KEYED          1
-#define CONFIG_AUTOBOOT_PROMPT                 \
-       "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Press SPACE to abort autoboot\n"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 #define CONFIG_AUTOBOOT_DELAY_STR      "d"