diff options
| author | Stefan Roese <sr@denx.de> | 2005-08-16 18:18:00 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2005-08-16 18:18:00 +0200 |
| commit | d6c61aabc49c22a5c040f046fdc04dc478ed071f (patch) | |
| tree | ea793de701f14cfa4154786c8a240d1d24964ad4 /include/configs | |
| parent | 98128f389cc318dbd1d597cf8d2d09902cddcb4b (diff) | |
| download | u-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.zip u-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.tar.gz u-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.tar.bz2 | |
Merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
now handling all 4xx cpu's.
Patch by Stefan Roese, 16 Aug 2005
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/KAREF.h | 1 | ||||
| -rw-r--r-- | include/configs/METROBOX.h | 1 | ||||
| -rw-r--r-- | include/configs/XPEDITE1K.h | 1 | ||||
| -rw-r--r-- | include/configs/bamboo.h | 4 | ||||
| -rw-r--r-- | include/configs/ocotea.h | 8 |
5 files changed, 11 insertions, 4 deletions
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 331131a..00a6e5d 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -166,6 +166,7 @@ #define CONFIG_HAS_ETH1 #define CONFIG_HAS_ETH2 #define CONFIG_HAS_ETH3 +#define CONFIG_PHY_RESET 1 /* reset phy upon startup */ #define CONFIG_CIS8201_PHY 1 /* RGMII mode for Cicada */ #define CONFIG_CIS8201_SHORT_ETCH 1 /* Use short etch mode */ #define CONFIG_PHY_GIGE 1 /* GbE speed/duplex detect */ diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 2b4a33f..cf6f00e 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -230,6 +230,7 @@ #define CONFIG_HAS_ETH1 #define CONFIG_HAS_ETH2 #define CONFIG_HAS_ETH3 +#define CONFIG_PHY_RESET 1 /* reset phy upon startup */ #define CONFIG_CIS8201_PHY 1 /* RGMII mode for Cicada */ #define CONFIG_CIS8201_SHORT_ETCH 1 /* Use short etch mode */ #define CONFIG_PHY_GIGE 1 /* GbE speed/duplex detect */ diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h index 347bb50..2e0b1a4 100644 --- a/include/configs/XPEDITE1K.h +++ b/include/configs/XPEDITE1K.h @@ -175,6 +175,7 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_PHY3_ADDR 8 /* PHY address phy3 */ #define CONFIG_NET_MULTI 1 #define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ +#define CONFIG_PHY_RESET 1 /* reset phy upon startup */ #define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ #define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 64ea6be..910de67 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -275,15 +275,13 @@ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 0 /* PHY address, See schematics */ +#define CONFIG_PHY1_ADDR 1 #ifndef CONFIG_BAMBOO_NAND #define CONFIG_NET_MULTI 1 /* required for netconsole */ -#define CONFIG_PHY1_ADDR 1 #define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */ #endif /* CONFIG_BAMBOO_NAND */ -#define CONFIG_NO_PHY_RESET 1 /* no PHY reset on bamboo!!! */ - #define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ /* Partitions */ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 2b0f687..05a575b 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -211,8 +211,14 @@ #define CONFIG_PHY1_ADDR 2 #define CONFIG_PHY2_ADDR 0x10 #define CONFIG_PHY3_ADDR 0x18 +#define CONFIG_HAS_ETH0 +#define CONFIG_HAS_ETH1 +#define CONFIG_HAS_ETH2 +#define CONFIG_HAS_ETH3 #define CONFIG_CIS8201_PHY 1 /* Enable 'special' RGMII mode for Cicada phy */ #define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ +#define CONFIG_PHY_RESET 1 /* reset phy upon startup */ +#define CONFIG_PHY_RESET_DELAY 1000 #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ @@ -256,7 +262,7 @@ #define CFG_LOAD_ADDR 0x100000 /* default load address */ #define CFG_EXTBDINFO 1 /* To use extended board_into (bd_t) */ -#define CFG_HZ 100 /* decrementer freq: 1 ms ticks */ +#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */ #define CONFIG_LOOPW 1 /* enable loopw command */ |