Merge branch 'mpc86xx'

[u-boot] / include / configs / SBC8540.h

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 6279d33fae7f6bd3c14c95f94c2677907f796215..0451b208197006d8dd0f574d939f8268517c6f65 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -29,7 +29,7 @@
 /* make sure you change the MAC address and other network params first,
  * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
  */
- 
+
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
@@ -46,7 +46,7 @@
 #define CONFIG_MPC85xx_REV1    1       /* MPC85xx Rev 1.0 chip         */
 
 
-#define CONFIG_MPC8560         1       /* MPC8560 (CPU) specific               */
+#define CONFIG_CPM2            1       /* has CPM2 */
 
 #define CONFIG_SBC8540         1       /* configuration for SBC8560 board */
 
@@ -203,7 +203,7 @@
 #define CFG_NS16550_COM1       ((CFG_BR5_PRELIM & 0xff000000)+0x00700000)
 #define CFG_NS16550_COM2       ((CFG_BR5_PRELIM & 0xff000000)+0x00800000)
 #else
-/* SBC8540 uses internal COMM controller */ 
+/* SBC8540 uses internal COMM controller */
 #define CFG_NS16550_COM1       ((CFG_CCSRBAR & 0xfff00000)+0x00004500)
 #define CFG_NS16550_COM2       ((CFG_CCSRBAR & 0xfff00000)+0x00004600)
 #endif
@@ -227,18 +227,22 @@
 
 #if defined(CONFIG_TSEC_ENET)          /* TSEC Ethernet port */
 
-  #define CONFIG_NET_MULTI     1
-  #define CONFIG_PHY_BCM5421S          /* GigaBit Ether PHY         */
-  #define CONFIG_MII           1       /* MII PHY management           */
-  #define CONFIG_PHY_ADDR      25      /* PHY address                  */
+#  define CONFIG_NET_MULTI     1
+#  define CONFIG_MPC85xx_TSEC1
+#  define CONFIG_MPC85xx_TSEC1_NAME    "TSEC0"
+#  define CONFIG_MII           1       /* MII PHY management           */
+#  define TSEC1_PHY_ADDR       25
+#  define TSEC1_PHYIDX         0
+/* Options are: TSEC0 */
+#  define CONFIG_ETHPRIME              "TSEC0"
+
 
- 
 #elif defined(CONFIG_ETHER_ON_FCC)     /* CPM FCC Ethernet */
 
   #undef  CONFIG_ETHER_NONE            /* define if ether on something else */
   #define CONFIG_ETHER_ON_FCC2         /* cpm FCC ethernet support     */
   #define CONFIG_ETHER_INDEX   2       /* which channel for ether  */
-  
+
   #if (CONFIG_ETHER_INDEX == 2)
     /*
      * - Rx-CLK is CLK13
@@ -250,11 +254,11 @@
     #define CFG_CMXFCR_VALUE   (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
     #define CFG_CPMFCR_RAMTYPE 0
     #define CFG_FCC_PSMR       (FCC_PSMR_FDE)
-    
+
   #elif (CONFIG_ETHER_INDEX == 3)
     /* need more definitions here for FE3 */
   #endif                               /* CONFIG_ETHER_INDEX */
-  
+
   #define CONFIG_MII                   /* MII PHY management */
   #define CONFIG_BITBANGMII            /* bit-bang MII PHY management  */
   /*
@@ -272,7 +276,7 @@
                        else    iop->pdat &= ~0x00200000
 
   #define MIIDELAY     udelay(1)
-  
+
 #endif
 
 /*-----------------------------------------------------------------------
@@ -400,9 +404,11 @@
 
 /*Note: change below for your network setting!!! */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
-  #define CONFIG_ETHADDR       00:vv:ww:xx:yy:8a
-  #define CONFIG_ETH1ADDR      00:vv:ww:xx:yy:8b
-  #define CONFIG_ETH2ADDR      00:vv:ww:xx:yy:8c
+#  define CONFIG_ETHADDR       00:vv:ww:xx:yy:8a
+#  define CONFIG_HAS_ETH1
+#  define CONFIG_ETH1ADDR      00:vv:ww:xx:yy:8b
+#  define CONFIG_HAS_ETH2
+#  define CONFIG_ETH2ADDR      00:vv:ww:xx:yy:8c
 #endif
 
 #define CONFIG_SERVERIP                YourServerIP