Merge with /home/wd/git/u-boot/master

[u-boot] / include / asm-ppc / cpm_8260.h

diff --git a/include/asm-ppc/cpm_8260.h b/include/asm-ppc/cpm_8260.h
index b3d08ffd4d75c152d21dd36fcc4fb0cb1c510122..2a9774ade83a723597bfda33fd46bdc52dd4bc68 100644 (file)
--- a/include/asm-ppc/cpm_8260.h
+++ b/include/asm-ppc/cpm_8260.h
@@ -83,9 +83,14 @@
  * downloading RAM microcode.
  */
 #define CPM_DATAONLY_BASE      ((uint)128)
-#define CPM_DATAONLY_SIZE      ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
 #define CPM_DP_NOSPACE         ((uint)0x7fffffff)
+#ifndef CONFIG_MPC8272_FAMILY
+#define CPM_DATAONLY_SIZE      ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
 #define CPM_FCC_SPECIAL_BASE   ((uint)0x0000b000)
+#else  /* 8247/48/71/72 */
+#define CPM_DATAONLY_SIZE      ((uint)(4 * 1024) - CPM_DATAONLY_BASE)
+#define CPM_FCC_SPECIAL_BASE   ((uint)0x00009000)
+#endif /* !CONFIG_MPC8272_FAMILY */
 
 /* The number of pages of host memory we allocate for CPM.  This is
  * done early in kernel initialization to get physically contiguous
@@ -683,6 +688,7 @@ typedef struct fcc_enet {
 #define FCC_PSMR_PRO   ((uint)0x00400000)      /* Promiscuous Enable */
 #define FCC_PSMR_FCE   ((uint)0x00200000)      /* Flow Control Enable */
 #define FCC_PSMR_RSH   ((uint)0x00100000)      /* Receive Short Frames */
+#define FCC_PSMR_RMII  ((uint)0x00020000)      /* Use RMII interface */
 #define FCC_PSMR_CAM   ((uint)0x00000400)      /* CAM enable */
 #define FCC_PSMR_BRO   ((uint)0x00000200)      /* Broadcast pkt discard */
 #define FCC_PSMR_ENCRC ((uint)0x00000080)      /* Use 32-bit CRC */