Home Explore Help
Register Sign In
phyus
/
uboot-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

powerpc: cpm2 boards: update fcc register logic

In the recent dropping of !NET_MULTI code (commit e2a53458a7ab37523304),
I misread the logic in include/net.h.  Some of it was used by NET_MULTI
code as glue between the multi/non-multi worlds for cpm2 boards.

Rather than restore the block of code, push the logic to the board config
headers where it all belongs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger 13 years ago
parent
92faa8b109
commit
d4590da436
25 changed files with 69 additions and 69 deletions
Split View Show Diff Stats
  1. 4 4
      include/configs/CPU86.h
  2. 4 4
      include/configs/CPU87.h
  3. 2 2
      include/configs/IDS8247.h
  4. 2 2
      include/configs/IPHASE4539.h
  5. 2 2
      include/configs/ISPAN.h
  6. 5 5
      include/configs/MPC8260ADS.h
  7. 2 2
      include/configs/MPC8266ADS.h
  8. 2 2
      include/configs/MPC8560ADS.h
  9. 2 2
      include/configs/RPXsuper.h
  10. 4 4
      include/configs/Rattler.h
  11. 2 2
      include/configs/SBC8540.h
  12. 4 4
      include/configs/SCM.h
  13. 3 3
      include/configs/TQM8260.h
  14. 2 2
      include/configs/TQM8272.h
  15. 2 2
      include/configs/ZPC1900.h
  16. 2 2
      include/configs/ep8260.h
  17. 4 4
      include/configs/gw8260.h
  18. 6 6
      include/configs/hymod.h
  19. 2 2
      include/configs/muas3001.h
  20. 2 2
      include/configs/ppmc8260.h
  21. 2 2
      include/configs/rsdproto.h
  22. 3 3
      include/configs/sacsng.h
  23. 2 2
      include/configs/sbc8560.h
  24. 2 2
      include/configs/stxgp3.h
  25. 2 2
      include/configs/stxssa.h

+ 4 - 4
include/configs/CPU86.h
View File 

@@ -89,8 +89,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK11|CMXFCR_TF1CS_CLK12)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK11|CMXFCR_TF1CS_CLK12)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 
 
@@ -102,8 +102,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 4 - 4
include/configs/CPU87.h
View File 

@@ -93,8 +93,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK11|CMXFCR_TF1CS_CLK12)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK11|CMXFCR_TF1CS_CLK12)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 
 
@@ -106,8 +106,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/IDS8247.h
View File 

@@ -154,8 +154,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK9)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK9)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/IPHASE4539.h
View File 

@@ -82,8 +82,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Half duplex
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/ISPAN.h
View File 

@@ -72,8 +72,8 @@
 
 #if CONFIG_ETHER_INDEX == 3
 
 
 #define CONFIG_SYS_PHY_ADDR		0
 
-#define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
 
-#define CONFIG_SYS_CMXFCR_MASK		(CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
+#define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
 
+#define CONFIG_SYS_CMXFCR_MASK3		(CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
 
 #endif /* CONFIG_ETHER_INDEX == 3 */

+ 5 - 5
include/configs/MPC8260ADS.h
View File 

@@ -128,20 +128,20 @@
 
 #if   CONFIG_ETHER_INDEX == 1
 
 
 # define CONFIG_SYS_PHY_ADDR		0
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK10)
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK10)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
 
 #elif CONFIG_ETHER_INDEX == 2
 
 
 #if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS	/* RxCLK is CLK15, TxCLK is CLK16 */
 
 # define CONFIG_SYS_PHY_ADDR		3
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK15 | CMXFCR_TF2CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK15 | CMXFCR_TF2CS_CLK16)
 
 #else					/* RxCLK is CLK13, TxCLK is CLK14 */
 
 # define CONFIG_SYS_PHY_ADDR		0
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
 #endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
 
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
 
 #endif	/* CONFIG_ETHER_INDEX */

+ 2 - 2
include/configs/MPC8266ADS.h
View File 

@@ -122,8 +122,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Half duplex
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 2 - 2
include/configs/MPC8560ADS.h
View File 

@@ -333,8 +333,8 @@
 
    * - Select bus for bd/buffers
 
    * - Full duplex
 
    */
 
-  #define CONFIG_SYS_CMXFCR_MASK       (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-  #define CONFIG_SYS_CMXFCR_VALUE      (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+  #define CONFIG_SYS_CMXFCR_MASK2      (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+  #define CONFIG_SYS_CMXFCR_VALUE2     (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
   #define CONFIG_SYS_CPMFCR_RAMTYPE    0
 
   #define CONFIG_SYS_FCC_PSMR          (FCC_PSMR_FDE)
 
   #define FETH2_RST		0x01

+ 2 - 2
include/configs/RPXsuper.h
View File 

@@ -107,8 +107,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Half Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 /*#define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB) */
 
 # define CONFIG_SYS_FCC_PSMR		0

+ 4 - 4
include/configs/Rattler.h
View File 

@@ -80,8 +80,8 @@
 
  * - BDs/buffers on 60x bus
 
  * - Full duplex
 
  */
 
-#define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
-#define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK10)
 
+#define CONFIG_SYS_CMXFCR_MASK1		(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
+#define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK10)
 
 #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 #define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)
 
 
@@ -92,8 +92,8 @@
 
  * - BDs/buffers on 60x bus
 
  * - Full duplex
 
  */
 
-#define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-#define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK15 | CMXFCR_TF2CS_CLK14)
 
+#define CONFIG_SYS_CMXFCR_MASK2		(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+#define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK15 | CMXFCR_TF2CS_CLK14)
 
 #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 #define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 2 - 2
include/configs/SBC8540.h
View File 

@@ -260,8 +260,8 @@
 
      * - Select bus for bd/buffers
 
      * - Full duplex
 
      */
 
-    #define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-    #define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+    #define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+    #define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
     #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
     #define CONFIG_SYS_FCC_PSMR	(FCC_PSMR_FDE)

+ 4 - 4
include/configs/SCM.h
View File 

@@ -153,8 +153,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK12|CMXFCR_TF1CS_CLK11)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK12|CMXFCR_TF1CS_CLK11)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 
 
@@ -166,8 +166,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 3 - 3
include/configs/TQM8260.h
View File 

@@ -181,7 +181,7 @@
 
  *  - RX clk is CLK11
 
  *  - TX clk is CLK12
 
  */
 
-# define CONFIG_SYS_CMXSCR_VALUE	(CMXSCR_RS1CS_CLK11 | CMXSCR_TS1CS_CLK12)
 
+# define CONFIG_SYS_CMXSCR_VALUE1	(CMXSCR_RS1CS_CLK11 | CMXSCR_TS1CS_CLK12)
 
 
 #elif defined(CONFIG_ETHER_ON_FCC) && (CONFIG_ETHER_INDEX == 2)
 
 
@@ -191,8 +191,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/TQM8272.h
View File 

@@ -208,8 +208,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/ZPC1900.h
View File 

@@ -76,8 +76,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Full duplex
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 2 - 2
include/configs/ep8260.h
View File 

@@ -200,8 +200,8 @@
 
  * - RAM for BD/Buffers is on the local Bus (see 28-13)
 
  * - Enable Half Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
 
 /*
 
  * - RAM for BD/Buffers is on the local Bus (see 28-13)

+ 4 - 4
include/configs/gw8260.h
View File 

@@ -240,8 +240,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)
 
 
@@ -253,8 +253,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 6 - 6
include/configs/hymod.h
View File 

@@ -89,8 +89,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK11)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK11)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 
 
@@ -110,8 +110,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)
 
 
@@ -131,8 +131,8 @@
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
+# define CONFIG_SYS_CMXFCR_MASK3	(CMXFCR_FC3|CMXFCR_RF3CS_MSK|CMXFCR_TF3CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE3	(CMXFCR_RF3CS_CLK15|CMXFCR_TF3CS_CLK16)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE|FCC_PSMR_LPB)

+ 2 - 2
include/configs/muas3001.h
View File 

@@ -83,8 +83,8 @@
 
  * - Rx-CLK is CLK11
 
  * - Tx-CLK is CLK12
 
  */
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK12)
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE1	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK12)
 
+# define CONFIG_SYS_CMXFCR_MASK1	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
 
 /*
 
  * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
 
  */

+ 2 - 2
include/configs/ppmc8260.h
View File 

@@ -372,8 +372,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-#define CONFIG_SYS_CMXFCR_MASK		(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-#define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+#define CONFIG_SYS_CMXFCR_MASK2		(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+#define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 #define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)
 
 #endif	/* CONFIG_ETHER_INDEX */

+ 2 - 2
include/configs/rsdproto.h
View File 

@@ -82,8 +82,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	(0)
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 3 - 3
include/configs/sacsng.h
View File 

@@ -203,7 +203,7 @@
 
  *  - RX clk is CLK11
 
  *  - TX clk is CLK12
 
  */
 
-# define CONFIG_SYS_CMXSCR_VALUE	(CMXSCR_RS1CS_CLK11  | CMXSCR_TS1CS_CLK12)
 
+# define CONFIG_SYS_CMXSCR_VALUE1	(CMXSCR_RS1CS_CLK11  | CMXSCR_TS1CS_CLK12)
 
 
 #elif defined(CONFIG_ETHER_ON_FCC) && (CONFIG_ETHER_INDEX == 2)
 
 
@@ -213,8 +213,8 @@
 
  * - Select bus for bd/buffers (see 28-13)
 
  * - Enable Full Duplex in FSMR
 
  */
 
-# define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
-# define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
+# define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
 
+# define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
 
 # define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 # define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE | FCC_PSMR_LPB)

+ 2 - 2
include/configs/sbc8560.h
View File 

@@ -260,8 +260,8 @@
 
      * - Select bus for bd/buffers
 
      * - Full duplex
 
      */
 
-    #define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-    #define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+    #define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+    #define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
     #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
     #define CONFIG_SYS_FCC_PSMR	(FCC_PSMR_FDE)

+ 2 - 2
include/configs/stxgp3.h
View File 

@@ -255,8 +255,8 @@
 
    * - Select bus for bd/buffers
 
    * - Full duplex
 
    */
 
-  #define CONFIG_SYS_CMXFCR_MASK       (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-  #define CONFIG_SYS_CMXFCR_VALUE      (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+  #define CONFIG_SYS_CMXFCR_MASK2      (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+  #define CONFIG_SYS_CMXFCR_VALUE2     (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
   #define CONFIG_SYS_CPMFCR_RAMTYPE    0
 
 #if 0
 
   #define CONFIG_SYS_FCC_PSMR          (FCC_PSMR_FDE)

+ 2 - 2
include/configs/stxssa.h
View File 

@@ -285,8 +285,8 @@
 
    * - Select bus for bd/buffers
 
    * - Full duplex
 
    */
 
-  #define CONFIG_SYS_CMXFCR_MASK	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
-  #define CONFIG_SYS_CMXFCR_VALUE	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
+  #define CONFIG_SYS_CMXFCR_MASK2	(CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
 
+  #define CONFIG_SYS_CMXFCR_VALUE2	(CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
 
   #define CONFIG_SYS_CPMFCR_RAMTYPE	0
 
 #if 0
 
   #define CONFIG_SYS_FCC_PSMR		(FCC_PSMR_FDE)