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

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

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

diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c
index 454ac215f4023f0121cb8d588f43b9b30c095260..834eb68bd28a8b8559f486433e05653e0425ad2a 100644 (file)
--- 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 529a4370db2a3590931ca9cb44db293c1212235e..30175461f0cc7350113035edf7fc1c101a4b5b3e 100644 (file)
--- 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 b73484ae2b45e9cec3e3f8e567b69d7727489c89..f41081fd113e0f4a1b4ff05ed1d67fb4147a0d15 100644 (file)
--- 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 2db40c834bd3d5f0ee5a5049386d7194b203f514..a6f9bc71c787760dff7d63fca94f796425585d27 100644 (file)
--- 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 d286ec0c33cc46a465dd14f2e2e2a930dfb66ac2..5ae035b986b492d17c983444f8cfaebdeffb826a 100644 (file)
--- 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);
 }