diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-12 08:23:58 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-12 08:23:58 +0200 |
| commit | 0878222fed3fafbfd0b1f2e5a6b2da90a81e910d (patch) | |
| tree | f88ba4ad1c5f06e6a772d5062c526d8153a71678 /include/configs | |
| parent | 0b15d51ed07db4c318d9c6b02b394ba5a3bc4296 (diff) | |
| parent | 154177e14a141468374f438ed3096ab097b79976 (diff) | |
| download | u-boot-imx-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.zip u-boot-imx-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.tar.gz u-boot-imx-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-net into next
* 'next' of git://git.denx.de/u-boot-net:
net: Inline the new eth_setenv_enetaddr_by_index function
net: allow setting env enetaddr from net device setting
net/designware: Consecutive writes to the same register to be avoided
CACHE: net: asix: Fix asix driver to work with data cache on
net: phy: micrel: make ksz9021 phy accessible
net: abort network initialization if the PHY driver fails
phylib: phy_startup() should return an error code on failure
net: tftp: fix type of block arg to store_block
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6qsabrelite.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index fbd10d6..e42fe6b 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -104,6 +104,7 @@ #define CONFIG_FEC_MXC_PHYADDR 6 #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ #define CONFIG_CMD_USB |