ARM DaVinci: Remove extern phy_t declaration by moving code to proper place.

Signed-off-by: Hugo Villeneuve hugo.villeneuve@lyrtech.com

---

board/davinci/dv-evm/dv_board.c | 6 +----- board/davinci/schmoogie/dv_board.c | 6 +----- board/davinci/sffsdr/sffsdr.c | 6 +----- board/davinci/sonata/dv_board.c | 6 +----- cpu/arm926ejs/davinci/ether.c | 2 ++ 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c index 454ac21..834eb68 100644 --- a/board/davinci/dv-evm/dv_board.c +++ b/board/davinci/dv-evm/dv_board.c @@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;

extern void timer_init(void); extern int eth_hw_init(void); -extern phy_t phy;

/* Works on Always On power domain only (no PD argument) */ @@ -184,11 +183,8 @@ int misc_init_r (void) } }

- if (!eth_hw_init()) { + if (!eth_hw_init()) printf("ethernet init failed!\n"); - } else { - printf("ETH PHY : %s\n", phy.name); - }

i2c_read (0x39, 0x00, 1, (u_int8_t *)&i, 1);

diff --git a/board/davinci/schmoogie/dv_board.c b/board/davinci/schmoogie/dv_board.c index 529a437..3017546 100644 --- a/board/davinci/schmoogie/dv_board.c +++ b/board/davinci/schmoogie/dv_board.c @@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;

extern void timer_init(void); extern int eth_hw_init(void); -extern phy_t phy;

/* Works on Always On power domain only (no PD argument) */ @@ -230,11 +229,8 @@ int misc_init_r (void) forceenv("serial#", (char *)&tmp[0]); }

- if (!eth_hw_init()) { + if (!eth_hw_init()) printf("ethernet init failed!\n"); - } else { - printf("ETH PHY : %s\n", phy.name); - }

return(0); } diff --git a/board/davinci/sffsdr/sffsdr.c b/board/davinci/sffsdr/sffsdr.c index b73484a..f41081f 100644 --- a/board/davinci/sffsdr/sffsdr.c +++ b/board/davinci/sffsdr/sffsdr.c @@ -43,7 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;

extern void timer_init(void); extern int eth_hw_init(void); -extern phy_t phy;

/* Works on Always On power domain only (no PD argument) */ @@ -288,11 +287,8 @@ int misc_init_r(void) } }

- if (!eth_hw_init()) { + if (!eth_hw_init()) printf("Ethernet init failed\n"); - } else { - printf("ETH PHY: %s\n", phy.name); - }

/* On this platform, U-Boot is copied in RAM by the UBL, * so we are always in the relocated state. */ diff --git a/board/davinci/sonata/dv_board.c b/board/davinci/sonata/dv_board.c index 2db40c8..a6f9bc7 100644 --- a/board/davinci/sonata/dv_board.c +++ b/board/davinci/sonata/dv_board.c @@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;

extern void timer_init(void); extern int eth_hw_init(void); -extern phy_t phy;

/* Works on Always On power domain only (no PD argument) */ @@ -185,11 +184,8 @@ int misc_init_r (void) } }

- if (!eth_hw_init()) { + if (!eth_hw_init()) printf("ethernet init failed!\n"); - } else { - printf("ETH PHY : %s\n", phy.name); - }

return(0); } diff --git a/cpu/arm926ejs/davinci/ether.c b/cpu/arm926ejs/davinci/ether.c index d286ec0..5ae035b 100644 --- a/cpu/arm926ejs/davinci/ether.c +++ b/cpu/arm926ejs/davinci/ether.c @@ -357,6 +357,8 @@ static int dm644x_eth_hw_init(void) phy.auto_negotiate = gen_auto_negotiate; }

+ printf("Ethernet PHY: %s\n", phy.name); + return(1); }