diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-29 21:58:16 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-29 21:58:16 +0200 |
commit | e365c43d6aa69b544a8f81d68596e89e9a3d6fa8 (patch) | |
tree | 12d945fae6090b4ba046906a7f0f5474bbc480af /include | |
parent | 178e26d75212f5aba63116585ef8f67ca6854e85 (diff) | |
parent | 77436d6696127dcaa9049db47b000da7f2b8e85e (diff) | |
download | u-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.zip u-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.tar.gz u-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-ti into next
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/da830evm.h | 1 | ||||
-rw-r--r-- | include/configs/davinci_dm365evm.h | 1 | ||||
-rw-r--r-- | include/configs/davinci_dvevm.h | 1 | ||||
-rw-r--r-- | include/configs/davinci_schmoogie.h | 1 | ||||
-rw-r--r-- | include/configs/davinci_sffsdr.h | 1 | ||||
-rw-r--r-- | include/configs/davinci_sonata.h | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index 0f58e11..160ece2 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -87,6 +87,7 @@ * Network & Ethernet Configuration */ #ifdef CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 1 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 6f99ae0..2c3d88d 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -58,6 +58,7 @@ /* Network Configuration */ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 0 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index 5774df5..aab2afa 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -102,6 +102,7 @@ /* Network & Ethernet Configuration */ /*==================================*/ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 1 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 3972ebc..875dda4 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -69,6 +69,7 @@ /* Network & Ethernet Configuration */ /*==================================*/ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 1 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 94be9dc..f4e17f8 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -66,6 +66,7 @@ #define CONFIG_SYS_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ /* Network & Ethernet Configuration */ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 1 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 490821a..4c01844 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -102,6 +102,7 @@ /* Network & Ethernet Configuration */ /*==================================*/ #define CONFIG_DRIVER_TI_EMAC +#define CONFIG_EMAC_MDIO_PHY_NUM 1 #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS |