diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-06-15 11:16:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-15 11:16:04 +0200 |
| commit | 57fe30194d3c15c37d9ff06dbd2a4c1ffccda018 (patch) | |
| tree | 84ec6bf344abc54d7cabed0cf13c5655dfb0bd86 /board/davinci | |
| parent | c11ff779f4e0e0c7edc322e84dd229ad28709595 (diff) | |
| parent | c9005a72fee4231e30fe93c1741cea2342c54504 (diff) | |
| download | u-boot-imx-57fe30194d3c15c37d9ff06dbd2a4c1ffccda018.zip u-boot-imx-57fe30194d3c15c37d9ff06dbd2a4c1ffccda018.tar.gz u-boot-imx-57fe30194d3c15c37d9ff06dbd2a4c1ffccda018.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/davinci')
| -rw-r--r-- | board/davinci/common/misc.h | 1 | ||||
| -rw-r--r-- | board/davinci/dvevm/dvevm.c | 3 | ||||
| -rw-r--r-- | board/davinci/schmoogie/schmoogie.c | 3 | ||||
| -rw-r--r-- | board/davinci/sffsdr/sffsdr.c | 3 | ||||
| -rw-r--r-- | board/davinci/sonata/sonata.c | 3 |
5 files changed, 0 insertions, 13 deletions
diff --git a/board/davinci/common/misc.h b/board/davinci/common/misc.h index 316159a..dc3cc41 100644 --- a/board/davinci/common/misc.h +++ b/board/davinci/common/misc.h @@ -22,7 +22,6 @@ #ifndef __MISC_H #define __MISC_H -extern int eth_hw_init(void); int dvevm_read_mac_address(uint8_t *buf); void dv_configure_mac_address(uint8_t *rom_enetaddr); diff --git a/board/davinci/dvevm/dvevm.c b/board/davinci/dvevm/dvevm.c index 8f38633..98937a9 100644 --- a/board/davinci/dvevm/dvevm.c +++ b/board/davinci/dvevm/dvevm.c @@ -73,9 +73,6 @@ int misc_init_r(void) if (dvevm_read_mac_address(eeprom_enetaddr)) dv_configure_mac_address(eeprom_enetaddr); - if (!eth_hw_init()) - printf("ethernet init failed!\n"); - i2c_read(0x39, 0x00, 1, &video_mode, 1); setenv("videostd", ((video_mode & 0x80) ? "pal" : "ntsc")); diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 6e0f591..19c9580 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -130,8 +130,5 @@ int misc_init_r(void) forceenv("serial#", (char *)&tmp[0]); } - if (!eth_hw_init()) - printf("ethernet init failed!\n"); - return(0); } diff --git a/board/davinci/sffsdr/sffsdr.c b/board/davinci/sffsdr/sffsdr.c index 7f4ee36..c24b9e1 100644 --- a/board/davinci/sffsdr/sffsdr.c +++ b/board/davinci/sffsdr/sffsdr.c @@ -143,8 +143,5 @@ int misc_init_r(void) if (sffsdr_read_mac_address(eeprom_enetaddr)) dv_configure_mac_address(eeprom_enetaddr); - if (!eth_hw_init()) - printf("Ethernet init failed\n"); - return(0); } diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c index a0bea05..7f9d9bb 100644 --- a/board/davinci/sonata/sonata.c +++ b/board/davinci/sonata/sonata.c @@ -70,8 +70,5 @@ int misc_init_r(void) if (dvevm_read_mac_address(eeprom_enetaddr)) dv_configure_mac_address(eeprom_enetaddr); - if (!eth_hw_init()) - printf("ethernet init failed!\n"); - return(0); } |