* Patch by Andre Schwarz, 24 Nov 2003:

[u-boot] / include / commproc.h

diff --git a/include/commproc.h b/include/commproc.h
index f0ee1792b2e8f422706d1e22902b6cf3bd665ccc..63dcc4c9a3dcdf03c6195a6d404af7fc8d4ab0b8 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -83,6 +83,12 @@
 #define CPM_POST_WORD_ADDR     CFG_CPM_POST_WORD_ADDR
 #endif
 
+#ifndef CFG_CPM_BOOTCOUNT_ADDR
+#define CPM_BOOTCOUNT_ADDR     (CPM_POST_WORD_ADDR - 2*sizeof(ulong))
+#else
+#define CPM_BOOTCOUNT_ADDR     CFG_CPM_BOOTCOUNT_ADDR
+#endif
+
 #define BD_IIC_START   ((uint) 0x0400) /* <- please use CPM_I2C_BASE !! */
 
 /* Export the base address of the communication processor registers
@@ -707,10 +713,10 @@ typedef struct scc_enet {
 
 /***  FADS860T********************************************************/
 
-#if defined(CONFIG_MPC860T) && defined(CONFIG_FADS)
-/* This ENET stuff is for the MPC860TFADS with ethernet on SCC1.
+#if (defined(CONFIG_MPC860T) || defined(CONFIG_MPC866_et_al)) \
+    && defined(CONFIG_FADS)
+/* This ENET stuff is for the MPC860TFADS/MPC8xxADS with ethernet on SCC1.
  */
-
 #ifdef CONFIG_SCC1_ENET
 #define        SCC_ENET        0
 #endif /* CONFIG_SCC1_ETHERNET */
@@ -1177,8 +1183,8 @@ typedef struct scc_enet {
 
 # endif /* CONFIG_FEC_ENET */
 #endif  /* CONFIG_SVM_SC8xx */
-       
-       
+
+
 #if defined(CONFIG_NETVIA)
 /* Bits in parallel I/O port registers that have to be set/cleared
  * to configure the pins for SCC2 use.
@@ -1191,7 +1197,12 @@ typedef struct scc_enet {
 #define PA_ENET_RCLK   ((ushort)0x0200)        /* PA  6 */
 #define PA_ENET_TCLK   ((ushort)0x0800)        /* PA  4 */
 
-#define PB_ENET_PDN    ((ushort)0x4000)        /* PB 17 */
+#if !defined(CONFIG_NETVIA_VERSION) || CONFIG_NETVIA_VERSION == 1
+# define PB_ENET_PDN   ((ushort)0x4000)        /* PB 17 */
+#elif CONFIG_NETVIA_VERSION >= 2
+# define PC_ENET_PDN   ((ushort)0x0008)        /* PC 12 */
+#endif
+
 #define PB_ENET_TENA   ((ushort)0x2000)        /* PB 18 */
 
 #define PC_ENET_CLSN   ((ushort)0x0040)        /* PC  9 */