diff options
author | Wolfgang Denk <wd@denx.de> | 2009-02-12 08:36:52 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-02-12 08:36:52 +0100 |
commit | 6b67962fd69ac0bcdf1a982669a029c2f0a7bcc1 (patch) | |
tree | d324e61aef75044afa2cb31e4bbeb0009d32a6fe /board | |
parent | c2d9befa0b4695b89476fb5d259742c09afe243f (diff) | |
parent | 9cacf4fc4035eabe9d9ae2a9a188c51a8027c91e (diff) | |
download | u-boot-imx-6b67962fd69ac0bcdf1a982669a029c2f0a7bcc1.zip u-boot-imx-6b67962fd69ac0bcdf1a982669a029c2f0a7bcc1.tar.gz u-boot-imx-6b67962fd69ac0bcdf1a982669a029c2f0a7bcc1.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board')
-rw-r--r-- | board/amcc/katmai/katmai.c | 1 | ||||
-rw-r--r-- | board/amcc/taihu/taihu.c | 1 | ||||
-rw-r--r-- | board/amcc/taishan/taishan.c | 1 | ||||
-rw-r--r-- | board/amcc/yucca/yucca.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index b6c0c11..e078ba4 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -451,5 +451,6 @@ int post_hotkeys_pressed(void) int board_eth_init(bd_t *bis) { + cpu_eth_init(bis); return pci_eth_init(bis); } diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index 5224378..669429b 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -195,5 +195,6 @@ int pci_pre_init(struct pci_controller *hose) int board_eth_init(bd_t *bis) { + cpu_eth_init(bis); return pci_eth_init(bis); } diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c index 28bdab5..53ce88c 100644 --- a/board/amcc/taishan/taishan.c +++ b/board/amcc/taishan/taishan.c @@ -315,5 +315,6 @@ int post_hotkeys_pressed(void) int board_eth_init(bd_t *bis) { + cpu_eth_init(bis); return pci_eth_init(bis); } diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c index c805568..06c7d62 100644 --- a/board/amcc/yucca/yucca.c +++ b/board/amcc/yucca/yucca.c @@ -956,5 +956,6 @@ int onboard_pci_arbiter_selected(int core_pci) int board_eth_init(bd_t *bis) { + cpu_eth_init(bis); return pci_eth_init(bis); } |