diff options
| author | Tom Rini <trini@ti.com> | 2013-02-18 09:57:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-18 09:57:06 -0500 |
| commit | 1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f (patch) | |
| tree | 65493c2c97adc37be6a60fc0a2fb81d214257fb1 /include/configs/km/km83xx-common.h | |
| parent | ea6bd08b7717bf0d3f69ad9f016bf3b03b3eaf16 (diff) | |
| parent | 411190cb16b63e39345a608b68b3d1be5168117a (diff) | |
| download | olio-uboot-2014.01-1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f.tar.xz olio-uboot-2014.01-1671ba7c0d5dd59c84cb3ae5dc586242d65cbf5f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'include/configs/km/km83xx-common.h')
| -rw-r--r-- | include/configs/km/km83xx-common.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index a9823d6ef..eb0e5b6f3 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -165,19 +165,15 @@ #define CONFIG_UEC_ETH #define CONFIG_ETHPRIME "UEC0" +#if !defined(CONFIG_MPC8309) #define CONFIG_UEC_ETH1 /* GETH1 */ #define UEC_VERBOSE_DEBUG 1 +#endif #ifdef CONFIG_UEC_ETH1 -#if defined(CONFIG_MPC8309) -#define CONFIG_SYS_UEC1_UCC_NUM 2 /* UCC3 */ -#define CONFIG_SYS_UEC1_RX_CLK QE_CLK_NONE /* not used in RMII Mode */ -#define CONFIG_SYS_UEC1_TX_CLK QE_CLK12 -#else #define CONFIG_SYS_UEC1_UCC_NUM 3 /* UCC4 */ #define CONFIG_SYS_UEC1_RX_CLK QE_CLK_NONE /* not used in RMII Mode */ #define CONFIG_SYS_UEC1_TX_CLK QE_CLK17 -#endif #define CONFIG_SYS_UEC1_ETH_TYPE FAST_ETH #define CONFIG_SYS_UEC1_PHY_ADDR 0 #define CONFIG_SYS_UEC1_INTERFACE_TYPE PHY_INTERFACE_MODE_RMII @@ -316,7 +312,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ - "dtt_bus=pca9547:70:a\0" \ "EEprom_ivm=pca9547:70:9\0" \ "newenv=" \ "prot off 0xF00C0000 +0x40000 && " \ |