summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>2010-01-22 17:15:55 -0500
committerMike Frysinger <vapier@gentoo.org>2010-04-07 01:10:34 -0400
commit6a0be8f8fe6d72a30e69d08decb72dc3bec5484c (patch)
treec7abc0cfdccf14906eb87bc305375af9aca903b2
parent216818c1a2d03b1c0994f00993c99af38c5b1e83 (diff)
downloadu-boot-imx-6a0be8f8fe6d72a30e69d08decb72dc3bec5484c.zip
u-boot-imx-6a0be8f8fe6d72a30e69d08decb72dc3bec5484c.tar.gz
u-boot-imx-6a0be8f8fe6d72a30e69d08decb72dc3bec5484c.tar.bz2
Blackfin: cm-bf561: update network/env settings
Switch to the SMC911X driver by default now, and fix LDR env settings. Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--board/cm-bf561/cm-bf561.c4
-rw-r--r--include/configs/cm-bf561.h11
2 files changed, 6 insertions, 9 deletions
diff --git a/board/cm-bf561/cm-bf561.c b/board/cm-bf561/cm-bf561.c
index 80cfff7..5741f64 100644
--- a/board/cm-bf561/cm-bf561.c
+++ b/board/cm-bf561/cm-bf561.c
@@ -18,9 +18,9 @@ int checkboard(void)
return 0;
}
-#ifdef CONFIG_SMC91111
+#ifdef CONFIG_SMC911X
int board_eth_init(bd_t *bis)
{
- return smc91111_initialize(0, CONFIG_SMC91111_BASE);
+ return smc911x_initialize(0, CONFIG_SMC911X_BASE);
}
#endif
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 1741ed4..c60401c 100644
--- 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
/*