LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define tsec flag values in config files 

The tsec_info structure and array has a "flags" field for each
ethernet controller.  This field is the only reason there are
settings.  Switch to defining TSECn_FLAGS for each controller
in the config header, and we can greatly simplify the array, and
also simplify the addition of future boards.

Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Andy Fleming 2007-08-15 20:03:25 -05:00 committed by Wolfgang Denk
parent ec72382295
commit 3a79013e2a
21 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/tsec.c
View File

@ -65,38 +65,30 @@ struct tsec_info_struct {
* FEC_PHYIDX * FEC_PHYIDX
*/ */
static struct tsec_info_struct tsec_info[] = { static struct tsec_info_struct tsec_info[] = {
#if defined(CONFIG_TSEC1) #ifdef CONFIG_TSEC1
#if defined(CONFIG_MPC8544DS) || defined(CONFIG_MPC8641HPCN) {TSEC1_PHY_ADDR, TSEC1_FLAGS, TSEC1_PHYIDX},
{TSEC1_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC1_PHYIDX},
#else
{TSEC1_PHY_ADDR, TSEC_GIGABIT, TSEC1_PHYIDX},
#endif
#else #else
{0, 0, 0}, {0, 0, 0},
#endif #endif
#if defined(CONFIG_TSEC2) #ifdef CONFIG_TSEC2
#if defined(CONFIG_MPC8641HPCN) {TSEC2_PHY_ADDR, TSEC2_FLAGS, TSEC2_PHYIDX},
{TSEC2_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC2_PHYIDX},
#else
{TSEC2_PHY_ADDR, TSEC_GIGABIT, TSEC2_PHYIDX},
#endif
#else #else
{0, 0, 0}, {0, 0, 0},
#endif #endif
#ifdef CONFIG_MPC85XX_FEC #ifdef CONFIG_MPC85XX_FEC
{FEC_PHY_ADDR, 0, FEC_PHYIDX}, {FEC_PHY_ADDR, FEC_FLAGS, FEC_PHYIDX},
#else #else
#if defined(CONFIG_TSEC3) #ifdef CONFIG_TSEC3
{TSEC3_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC3_PHYIDX}, {TSEC3_PHY_ADDR, TSEC3_FLAGS, TSEC3_PHYIDX},
#else #else
{0, 0, 0}, {0, 0, 0},
#endif #endif
#if defined(CONFIG_TSEC4) #ifdef CONFIG_TSEC4
{TSEC4_PHY_ADDR, TSEC_GIGABIT | TSEC_REDUCED, TSEC4_PHYIDX}, {TSEC4_PHY_ADDR, TSEC4_FLAGS, TSEC4_PHYIDX},
#else #else
{0, 0, 0}, {0, 0, 0},
#endif #endif /* CONFIG_TSEC4 */
#endif #endif /* CONFIG_MPC85XX_FEC */
}; };
#define MAXCONTROLLERS (4) #define MAXCONTROLLERS (4)

2
include/configs/MPC8313ERDB.h
View File

@ -310,6 +310,8 @@
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#define TSEC1_PHY_ADDR 0x1c #define TSEC1_PHY_ADDR 0x1c
#define TSEC2_PHY_ADDR 4 #define TSEC2_PHY_ADDR 4
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0

2
include/configs/MPC8349EMDS.h
View File

@ -440,6 +440,8 @@
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

2
include/configs/MPC8349ITX.h
View File

@ -382,6 +382,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CFG_TSEC1_OFFSET 0x24000 #define CFG_TSEC1_OFFSET 0x24000
#define TSEC1_PHY_ADDR 0x1c /* VSC8201 uses address 0x1c */ #define TSEC1_PHY_ADDR 0x1c /* VSC8201 uses address 0x1c */
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#endif #endif
#ifdef CONFIG_TSEC2 #ifdef CONFIG_TSEC2
@ -391,6 +392,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_UNKNOWN_TSEC /* TSEC2 is proprietary */ #define CONFIG_UNKNOWN_TSEC /* TSEC2 is proprietary */
#define TSEC2_PHY_ADDR 4 #define TSEC2_PHY_ADDR 4
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC2_FLAGS TSEC_GIGABIT
#endif #endif
#define CONFIG_ETHPRIME "Freescale TSEC" #define CONFIG_ETHPRIME "Freescale TSEC"

3
include/configs/MPC8540ADS.h
View File

@ -374,6 +374,8 @@
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#if CONFIG_HAS_FEC #if CONFIG_HAS_FEC
@ -381,6 +383,7 @@
#define CONFIG_MPC85XX_FEC_NAME "FEC" #define CONFIG_MPC85XX_FEC_NAME "FEC"
#define FEC_PHY_ADDR 3 #define FEC_PHY_ADDR 3
#define FEC_PHYIDX 0 #define FEC_PHYIDX 0
#define FEC_FLAGS 0
#endif #endif
/* Options are: TSEC[0-1], FEC */ /* Options are: TSEC[0-1], FEC */

4
include/configs/MPC8540EVAL.h
View File

@ -224,6 +224,10 @@
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define FEC_PHYIDX 0 #define FEC_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define FEC_FLAGS 0
/* Options are: TSEC[0-1], FEC */ /* Options are: TSEC[0-1], FEC */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

5
include/configs/MPC8541CDS.h
View File

@ -384,13 +384,12 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 0 #define TSEC1_PHY_ADDR 0
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define FEC_PHY_ADDR 3
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define FEC_PHYIDX 0 #define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

8
include/configs/MPC8544DS.h
View File

@ -364,15 +364,13 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC1_NAME "eTSEC1"
#define CONFIG_TSEC3 1 #define CONFIG_TSEC3 1
#define CONFIG_TSEC3_NAME "eTSEC3" #define CONFIG_TSEC3_NAME "eTSEC3"
#undef CONFIG_MPC85XX_FEC
#define CONFIG_TSEC_TBI 1 /* enable internal TBI phy */
#define CONFIG_SGMII_RISER
#define TSEC1_SGMII_PHY_ADDR_OFFSET 0x1c /* sgmii phy base */
#define TSEC1_PHY_ADDR 0 #define TSEC1_PHY_ADDR 0
#define TSEC3_PHY_ADDR 1 #define TSEC3_PHY_ADDR 1
#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC3_PHYIDX 0 #define TSEC3_PHYIDX 0

4
include/configs/MPC8548CDS.h
View File

@ -447,6 +447,10 @@ extern unsigned long get_clock_freq(void);
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC3_PHYIDX 0 #define TSEC3_PHYIDX 0
#define TSEC4_PHYIDX 0 #define TSEC4_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC4_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
/* Options are: eTSEC[0-3] */ /* Options are: eTSEC[0-3] */
#define CONFIG_ETHPRIME "eTSEC0" #define CONFIG_ETHPRIME "eTSEC0"

5
include/configs/MPC8555CDS.h
View File

@ -384,13 +384,12 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 0 #define TSEC1_PHY_ADDR 0
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define FEC_PHY_ADDR 3
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define FEC_PHYIDX 0 #define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

3
include/configs/MPC8560ADS.h
View File

@ -360,11 +360,12 @@
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 0 #define TSEC1_PHY_ADDR 0
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

6
include/configs/MPC8568MDS.h
View File

@ -399,9 +399,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_TSEC1_NAME "eTSEC0" #define CONFIG_TSEC1_NAME "eTSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "eTSEC1" #define CONFIG_TSEC2_NAME "eTSEC1"
#undef CONFIG_TSEC3
#undef CONFIG_TSEC4
#undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 2 #define TSEC1_PHY_ADDR 2
#define TSEC2_PHY_ADDR 3 #define TSEC2_PHY_ADDR 3
@ -409,6 +406,9 @@ extern unsigned long get_clock_freq(void);
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: eTSEC[0-3] */ /* Options are: eTSEC[0-3] */
#define CONFIG_ETHPRIME "eTSEC0" #define CONFIG_ETHPRIME "eTSEC0"

4
include/configs/MPC8641HPCN.h
View File

@ -417,6 +417,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC3_PHYIDX 0 #define TSEC3_PHYIDX 0
#define TSEC4_PHYIDX 0 #define TSEC4_PHYIDX 0
#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define TSEC4_FLAGS (TSEC_GIGABIT | TSEC_REDUCED)
#define CONFIG_ETHPRIME "eTSEC1" #define CONFIG_ETHPRIME "eTSEC1"

3
include/configs/PM854.h
View File

@ -270,11 +270,14 @@
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define CONFIG_MPC85XX_FEC 1 #define CONFIG_MPC85XX_FEC 1
#define CONFIG_MPC85XX_FEC_NAME "FEC" #define CONFIG_MPC85XX_FEC_NAME "FEC"
#define FEC_PHY_ADDR 3 #define FEC_PHY_ADDR 3
#define FEC_PHYIDX 0 #define FEC_PHYIDX 0
#define FEC_FLAGS 0
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

3
include/configs/PM856.h
View File

@ -262,11 +262,12 @@
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 0 #define TSEC1_PHY_ADDR 0
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#endif /* CONFIG_TSEC_ENET */ #endif /* CONFIG_TSEC_ENET */

2
include/configs/TQM834x.h
View File

@ -253,6 +253,8 @@ extern int tqm834x_num_flash_banks;
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

3
include/configs/TQM85xx.h
View File

@ -266,8 +266,11 @@
#define TSEC2_PHY_ADDR 1 #define TSEC2_PHY_ADDR 1
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define FEC_PHY_ADDR 3 #define FEC_PHY_ADDR 3
#define FEC_PHYIDX 0 #define FEC_PHYIDX 0
#define FEC_FLAGS 0
#define CONFIG_HAS_ETH1 #define CONFIG_HAS_ETH1
#define CONFIG_HAS_ETH2 #define CONFIG_HAS_ETH2

2
include/configs/sbc8349.h
View File

@ -410,6 +410,8 @@
#define TSEC2_PHY_ADDR 0x1a #define TSEC2_PHY_ADDR 0x1a
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
/* Options are: TSEC[0-1] */ /* Options are: TSEC[0-1] */
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"

4
include/configs/sbc8641d.h
View File

@ -380,6 +380,10 @@
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC3_PHYIDX 0 #define TSEC3_PHYIDX 0
#define TSEC4_PHYIDX 0 #define TSEC4_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define TSEC3_FLAGS TSEC_GIGABIT
#define TSEC4_FLAGS TSEC_GIGABIT
#define CFG_TBIPA_VALUE 0x1e /* Set TBI address not to conflict with TSEC1_PHY_ADDR */ #define CFG_TBIPA_VALUE 0x1e /* Set TBI address not to conflict with TSEC1_PHY_ADDR */

3
include/configs/stxgp3.h
View File

@ -234,12 +234,13 @@
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#undef CONFIG_MPS85XX_FEC
#define TSEC1_PHY_ADDR 2 #define TSEC1_PHY_ADDR 2
#define TSEC2_PHY_ADDR 4 #define TSEC2_PHY_ADDR 4
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"
#elif defined(CONFIG_ETHER_ON_FCC) /* CPM FCC Ethernet */ #elif defined(CONFIG_ETHER_ON_FCC) /* CPM FCC Ethernet */

3
include/configs/stxssa.h
View File

@ -260,12 +260,13 @@
#define CONFIG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC1_NAME "TSEC0"
#define CONFIG_TSEC2 1 #define CONFIG_TSEC2 1
#define CONFIG_TSEC2_NAME "TSEC1" #define CONFIG_TSEC2_NAME "TSEC1"
#define CONFIG_MPS85XX_FEC
#define TSEC1_PHY_ADDR 2 #define TSEC1_PHY_ADDR 2
#define TSEC2_PHY_ADDR 4 #define TSEC2_PHY_ADDR 4
#define TSEC1_PHYIDX 0 #define TSEC1_PHYIDX 0
#define TSEC2_PHYIDX 0 #define TSEC2_PHYIDX 0
#define TSEC1_FLAGS TSEC_GIGABIT
#define TSEC2_FLAGS TSEC_GIGABIT
#define CONFIG_ETHPRIME "TSEC0" #define CONFIG_ETHPRIME "TSEC0"
#elif defined(CONFIG_ETHER_ON_FCC) /* CPM FCC Ethernet */ #elif defined(CONFIG_ETHER_ON_FCC) /* CPM FCC Ethernet */