diff options
| author | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
|---|---|---|
| committer | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
| commit | a20e7106928a284a6d14c066c54b72e552075b06 (patch) | |
| tree | e3dde666da99073732b97778e030d1beb0e75c09 /include | |
| parent | a6154fd1cfd020f6da8527e0365b1020a11a71d0 (diff) | |
| parent | cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 (diff) | |
| download | blackbird-obmc-uboot-a20e7106928a284a6d14c066c54b72e552075b06.tar.gz blackbird-obmc-uboot-a20e7106928a284a6d14c066c54b72e552075b06.zip | |
Merge http://www.denx.de/git/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/PLU405.h | 8 | ||||
| -rw-r--r-- | include/i2c.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index dd5d831680..d02c39b28f 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -51,17 +51,13 @@ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#if 0 /* test-only */ #define CONFIG_NET_MULTI 1 +#undef CONFIG_HAS_ETH1 #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 0 /* PHY address */ -#define CONFIG_PHY1_ADDR 1 /* PHY address */ -#else -#define CONFIG_MII 1 /* MII PHY management */ -#define CONFIG_PHY_ADDR 0 /* PHY address */ -#endif #define CONFIG_LXT971_NO_SLEEP 1 /* disable sleep mode in LXT971 */ +#define CONFIG_RESET_PHY_R 1 /* use reset_phy() to disable phy sleep mode */ #define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/ diff --git a/include/i2c.h b/include/i2c.h index d31c72d247..6e6c845312 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -63,6 +63,9 @@ #if !defined(CFG_DTT_BUS_NUM) #define CFG_DTT_BUS_NUM 0 #endif +#if !defined(CFG_SPD_BUS_NUM) +#define CFG_SPD_BUS_NUM 0 +#endif /* * Initialization, must be called once on start up, may be called |
