diff options
author | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
commit | 98c440bee623ecdd5322852732b883e696fb2140 (patch) | |
tree | ad8b06bc01822cfff8dc53d6651c59c24ac1babe /include/configs/MPC8349ITX.h | |
parent | e4feb7638ca0a2138973f14456424acbc332ae43 (diff) | |
parent | 1f2a05898658900dc5717761e27abf2052e67e13 (diff) | |
download | u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.zip u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.tar.gz u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.tar.bz2 |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'include/configs/MPC8349ITX.h')
-rw-r--r-- | include/configs/MPC8349ITX.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 906339e..834934d 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -374,18 +374,18 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_MII #define CONFIG_PHY_GIGE /* In case CFG_CMD_MII is specified */ -#define CONFIG_MPC83XX_TSEC1 +#define CONFIG_TSEC1 -#ifdef CONFIG_MPC83XX_TSEC1 -#define CONFIG_MPC83XX_TSEC1_NAME "TSEC0" +#ifdef CONFIG_TSEC1 +#define CONFIG_TSEC1_NAME "TSEC0" #define CFG_TSEC1_OFFSET 0x24000 #define TSEC1_PHY_ADDR 0x1c /* VSC8201 uses address 0x1c */ #define TSEC1_PHYIDX 0 #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 #define CONFIG_HAS_ETH1 -#define CONFIG_MPC83XX_TSEC2_NAME "TSEC1" +#define CONFIG_TSEC2_NAME "TSEC1" #define CFG_TSEC2_OFFSET 0x25000 #define CONFIG_UNKNOWN_TSEC /* TSEC2 is proprietary */ #define TSEC2_PHY_ADDR 4 @@ -628,11 +628,11 @@ boards, we say we have two, but don't display a message if we find only one. */ */ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 #define CONFIG_ETHADDR 00:E0:0C:00:8C:01 #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 #define CONFIG_ETH1ADDR 00:E0:0C:00:8C:02 #endif |