mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
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>
This commit is contained in:
parent
3a9e7ba2ac
commit
85e5808e8e
5 changed files with 6 additions and 20 deletions
|
@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
extern void timer_init(void);
|
extern void timer_init(void);
|
||||||
extern int eth_hw_init(void);
|
extern int eth_hw_init(void);
|
||||||
extern phy_t phy;
|
|
||||||
|
|
||||||
|
|
||||||
/* Works on Always On power domain only (no PD argument) */
|
/* 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");
|
printf("ethernet init failed!\n");
|
||||||
} else {
|
|
||||||
printf("ETH PHY : %s\n", phy.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
i2c_read (0x39, 0x00, 1, (u_int8_t *)&i, 1);
|
i2c_read (0x39, 0x00, 1, (u_int8_t *)&i, 1);
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
extern void timer_init(void);
|
extern void timer_init(void);
|
||||||
extern int eth_hw_init(void);
|
extern int eth_hw_init(void);
|
||||||
extern phy_t phy;
|
|
||||||
|
|
||||||
|
|
||||||
/* Works on Always On power domain only (no PD argument) */
|
/* Works on Always On power domain only (no PD argument) */
|
||||||
|
@ -230,11 +229,8 @@ int misc_init_r (void)
|
||||||
forceenv("serial#", (char *)&tmp[0]);
|
forceenv("serial#", (char *)&tmp[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!eth_hw_init()) {
|
if (!eth_hw_init())
|
||||||
printf("ethernet init failed!\n");
|
printf("ethernet init failed!\n");
|
||||||
} else {
|
|
||||||
printf("ETH PHY : %s\n", phy.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
extern void timer_init(void);
|
extern void timer_init(void);
|
||||||
extern int eth_hw_init(void);
|
extern int eth_hw_init(void);
|
||||||
extern phy_t phy;
|
|
||||||
|
|
||||||
|
|
||||||
/* Works on Always On power domain only (no PD argument) */
|
/* 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");
|
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,
|
/* On this platform, U-Boot is copied in RAM by the UBL,
|
||||||
* so we are always in the relocated state. */
|
* so we are always in the relocated state. */
|
||||||
|
|
|
@ -33,7 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
extern void timer_init(void);
|
extern void timer_init(void);
|
||||||
extern int eth_hw_init(void);
|
extern int eth_hw_init(void);
|
||||||
extern phy_t phy;
|
|
||||||
|
|
||||||
|
|
||||||
/* Works on Always On power domain only (no PD argument) */
|
/* 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");
|
printf("ethernet init failed!\n");
|
||||||
} else {
|
|
||||||
printf("ETH PHY : %s\n", phy.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -357,6 +357,8 @@ static int dm644x_eth_hw_init(void)
|
||||||
phy.auto_negotiate = gen_auto_negotiate;
|
phy.auto_negotiate = gen_auto_negotiate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
printf("Ethernet PHY: %s\n", phy.name);
|
||||||
|
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue