Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / include / configs / cm-bf561.h

diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 1741ed493211d9306a77b769097351ad5e88713e..c60401c8fecb3a33058b720820f58e9fed837f2d 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -63,14 +63,10 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-/* The next 2 lines are for use with DEV-BF5xx */
 #define CONFIG_NET_MULTI
-#define CONFIG_SMC91111        1
-#define CONFIG_SMC91111_BASE   0x28000300
-/* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */
-/* #define CONFIG_DRIVER_SMC911X 1 */
-/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 /! AMS1 */
-/* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */
+#define CONFIG_SMC911X         1
+#define CONFIG_SMC911X_BASE    0x24008000 /* AMS1 */
+#define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                cm-bf561
 /* Uncomment next line to use fixed MAC address */
 /* #define CONFIG_ETHADDR      02:80:ad:20:31:cf */
@@ -94,6 +90,7 @@
 #define CONFIG_ENV_OFFSET      0x20000
 #define CONFIG_ENV_SECT_SIZE   0x20000
 #define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
 
 /*