* [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() @ 2008-07-11 19:10 Hugo Villeneuve 2008-07-11 19:10 ` [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place Hugo Villeneuve 2008-07-14 22:05 ` [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 2 replies; 4+ messages in thread From: Hugo Villeneuve @ 2008-07-11 19:10 UTC (permalink / raw) To: u-boot ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init(). Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> --- board/davinci/dv-evm/dv_board.c | 3 --- board/davinci/schmoogie/dv_board.c | 3 --- board/davinci/sonata/dv_board.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c index 88b1e57..454ac21 100644 --- a/board/davinci/dv-evm/dv_board.c +++ b/board/davinci/dv-evm/dv_board.c @@ -29,11 +29,8 @@ #include <asm/arch/hardware.h> #include <asm/arch/emac_defs.h> -#define MACH_TYPE_DAVINCI_EVM 901 - DECLARE_GLOBAL_DATA_PTR; -extern void i2c_init(int speed, int slaveaddr); extern void timer_init(void); extern int eth_hw_init(void); extern phy_t phy; diff --git a/board/davinci/schmoogie/dv_board.c b/board/davinci/schmoogie/dv_board.c index 13d2195..529a437 100644 --- a/board/davinci/schmoogie/dv_board.c +++ b/board/davinci/schmoogie/dv_board.c @@ -29,11 +29,8 @@ #include <asm/arch/hardware.h> #include <asm/arch/emac_defs.h> -#define MACH_TYPE_SCHMOOGIE 1255 - DECLARE_GLOBAL_DATA_PTR; -extern void i2c_init(int speed, int slaveaddr); extern void timer_init(void); extern int eth_hw_init(void); extern phy_t phy; diff --git a/board/davinci/sonata/dv_board.c b/board/davinci/sonata/dv_board.c index e8665e5..2db40c8 100644 --- a/board/davinci/sonata/dv_board.c +++ b/board/davinci/sonata/dv_board.c @@ -29,11 +29,8 @@ #include <asm/arch/hardware.h> #include <asm/arch/emac_defs.h> -#define MACH_TYPE_SONATA 1254 - DECLARE_GLOBAL_DATA_PTR; -extern void i2c_init(int speed, int slaveaddr); extern void timer_init(void); extern int eth_hw_init(void); extern phy_t phy; ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place @ 2008-07-11 19:10 ` Hugo Villeneuve 2008-07-14 22:05 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 4+ messages in thread From: Hugo Villeneuve @ 2008-07-11 19:10 UTC (permalink / raw) To: u-boot 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); } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place 2008-07-11 19:10 ` [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place Hugo Villeneuve @ 2008-07-14 22:05 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 4+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-07-14 22:05 UTC (permalink / raw) To: u-boot On 15:10 Fri 11 Jul , Hugo Villeneuve wrote: > 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(-) > Applied. Thanks. Best regards, J. ^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() 2008-07-11 19:10 [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() Hugo Villeneuve 2008-07-11 19:10 ` [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place Hugo Villeneuve @ 2008-07-14 22:05 ` Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 0 replies; 4+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-07-14 22:05 UTC (permalink / raw) To: u-boot On 15:10 Fri 11 Jul , Hugo Villeneuve wrote: > ARM DaVinci: Remove duplicate definitions of MACH_TYPE > and prototype of i2c_init(). > > Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> > > --- > > board/davinci/dv-evm/dv_board.c | 3 --- > board/davinci/schmoogie/dv_board.c | 3 --- > board/davinci/sonata/dv_board.c | 3 --- > 3 files changed, 0 insertions(+), 9 deletions(-) > Applied. Thanks. Best regards, J. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-07-14 22:05 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-07-11 19:10 [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() Hugo Villeneuve 2008-07-11 19:10 ` [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place Hugo Villeneuve 2008-07-14 22:05 ` Jean-Christophe PLAGNIOL-VILLARD 2008-07-14 22:05 ` [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox