diff options
author | Bernhard Kaindl <bernhard.kaindl@gmx.net> | 2011-10-20 14:56:59 +0400 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-12-09 01:22:03 +0400 |
commit | d0201692988adc5d8cdbbf5e0cbf47e1a09708aa (patch) | |
tree | f810c8116edb270df1ab12435c7c68ebd8f88be3 /board/renesas/r7780mp | |
parent | d82a27bc5c404da907f71960a3ed2e148ac73fd0 (diff) | |
download | u-boot-d0201692988adc5d8cdbbf5e0cbf47e1a09708aa.tar.xz |
ne2000: Convert to new net-multi model, fixes build of three boards
This fixes the build of the two sh boards shmin and r7780mp and qemu-mips
which currently fail to build due to dropped pre-CONFIG_NET_MULTI code.
This v2 patch minimizes the number of lines in the diff for easy review
and to eliminate any possible accidential changes resulting from moving
lines of code in the file. This also makes the register function very easy.
Any cleanups and improvements are intentionally deferred to follow-up patches
to keep this patch as simple and as easy to review as possible.
A new driver register function, ne2k_register() calls the existing
one-time setup part of the old init function and calls eth_register().
Changes to shmin, r7780mp and qemu-mips:
- Call the new ne2k_register() from board_eth_init() of the boards.
- Tested using qemu-mips board,
- Tested the two renesas / sh boards r7780mp and shmin to compile again,
and should work.
checkpatch-clean when "--ignore VOLATILE" is added to .checkpatch.conf,
and no warnings introduced in none of the three boards using this driver.
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@gmx.net>
Diffstat (limited to 'board/renesas/r7780mp')
-rw-r--r-- | board/renesas/r7780mp/r7780mp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c index 0b80099047..82cef025ad 100644 --- a/board/renesas/r7780mp/r7780mp.c +++ b/board/renesas/r7780mp/r7780mp.c @@ -81,5 +81,6 @@ void pci_init_board(void) int board_eth_init(bd_t *bis) { - return pci_eth_init(bis); + /* return >= 0 if a chip is found, the board's AX88796L is n2k-based */ + return ne2k_register() + pci_eth_init(bis); } |