diff options
| author | wdenk <wdenk> | 2004-03-23 23:20:24 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-03-23 23:20:24 +0000 |
| commit | 6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 (patch) | |
| tree | c984d6e17157fb9400abc0c50e4e5ac19eb4316d /include | |
| parent | eeb1b77b7d994b2fde385d5b90bb1abfc0ba3bee (diff) | |
| download | blackbird-obmc-uboot-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.tar.gz blackbird-obmc-uboot-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.zip | |
* Patch by Stephen Williams, 19 March 2004
Increase speed of sector reads from SystemACE,
shorten poll timeout and remove a useless reset
* Patch by Tolunay Orkun, 19 Mar 2004:
Make GigE PHY 1000Mbps Speed/Duplex detection conditional
(CONFIG_PHY_GIGE)
* Patch by Brad Kemp, 18 Mar 2004:
prevent machine checks during a PCI scan
* Patch by Pierre Aubert, 18 Mar 2004:
Fix string cleaning in IDE identification
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/OCOTEA.h | 1 | ||||
| -rw-r--r-- | include/configs/XPEDITE1K.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/OCOTEA.h b/include/configs/OCOTEA.h index dea8953832..74e5acd542 100644 --- a/include/configs/OCOTEA.h +++ b/include/configs/OCOTEA.h @@ -150,6 +150,7 @@ #define CONFIG_PHY2_ADDR 0x10 #define CONFIG_PHY3_ADDR 0x18 #define CONFIG_CIS8201_PHY 1 /* Enable 'special' RGMII mode for Cicada phy */ +#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_IPADDR 10.1.2.3 #define CONFIG_ETHADDR 00:04:AC:E3:28:8A diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h index 4a19541b02..3cc4ff41a1 100644 --- a/include/configs/XPEDITE1K.h +++ b/include/configs/XPEDITE1K.h @@ -174,6 +174,7 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_PHY2_ADDR 4 /* PHY address phy2 */ #define CONFIG_PHY3_ADDR 8 /* PHY address phy3 */ #define CONFIG_NET_MULTI 1 +#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ #define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ |
