diff options
| author | wdenk <wdenk> | 2004-06-09 13:37:52 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-06-09 13:37:52 +0000 |
| commit | f39748ae8edb03017647b0d731cdd06e7bdcde13 (patch) | |
| tree | 1401c99d4d11bef3828da3bda191e8923f3f1147 /lib_arm | |
| parent | aa24509041ff8a4892071c2abec023dddd53874f (diff) | |
| download | blackbird-obmc-uboot-f39748ae8edb03017647b0d731cdd06e7bdcde13.tar.gz blackbird-obmc-uboot-f39748ae8edb03017647b0d731cdd06e7bdcde13.zip | |
* Patch by Paul Ruhland, 17 May 2004:
- Add support for the Logic Zoom LH7A40x based SDK board(s),
specifically the LPD7A400.
* Patches by Robert Schwebel, 15 May 2004:
- call MAC address reading code also for SMSC91C111;
- make SMSC91C111 timeout configurable, remove duplicate code
- fix get_timer() for PXA
- update doc/README.JFFS2
- use "bootfile" env variable also for jffs2
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/board.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 193980eff9..bba944af32 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -32,6 +32,13 @@ #include <version.h> #include <net.h> +#ifdef CONFIG_DRIVER_SMC91111 +#include "../drivers/smc91111.h" +#endif +#ifdef CONFIG_DRIVER_LAN91C96 +#include "../drivers/lan91c96.h" +#endif + #if (CONFIG_COMMANDS & CFG_CMD_NAND) void nand_init (void); #endif @@ -58,9 +65,6 @@ extern void cs8900_get_enetaddr (uchar * addr); extern void rtl8019_get_enetaddr (uchar * addr); #endif -#ifdef CONFIG_DRIVER_LAN91C96 -#include "../drivers/lan91c96.h" -#endif /* * Begin and End of memory area for malloc(), and current "brk" */ @@ -302,11 +306,12 @@ void start_armboot (void) cs8900_get_enetaddr (gd->bd->bi_enetaddr); #endif -#ifdef CONFIG_DRIVER_LAN91C96 +#if defined(CONFIG_DRIVER_SMC91111) || defined (CONFIG_DRIVER_LAN91C96) if (getenv ("ethaddr")) { smc_set_mac_addr(gd->bd->bi_enetaddr); } -#endif /* CONFIG_DRIVER_LAN91C96 */ + eth_init(gd->bd); +#endif /* CONFIG_DRIVER_SMC91111 || CONFIG_DRIVER_LAN91C96 */ /* Initialize from environment */ if ((s = getenv ("loadaddr")) != NULL) { |
