Merge branch 'master' of git://www.denx.de/git/u-boot-net

[oweals/u-boot.git] / include / asm-ppc / cpm_85xx.h

diff --git a/include/asm-ppc/cpm_85xx.h b/include/asm-ppc/cpm_85xx.h
index 885663fef2140a076e21d77ae007626d6debf358..a74a3a115bf3ecdebe994cd12ad76765052c3500 100644 (file)
--- a/include/asm-ppc/cpm_85xx.h
+++ b/include/asm-ppc/cpm_85xx.h
@@ -77,9 +77,14 @@
  * downloading RAM microcode.
  */
 #define CPM_DATAONLY_BASE      ((uint)128)
+#define CPM_DP_NOSPACE         ((uint)0x7FFFFFFF)
+#if defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
+#define CPM_FCC_SPECIAL_BASE   ((uint)0x00009000)
+#define CPM_DATAONLY_SIZE      ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
+#else  /* MPC8540, MPC8560 */
+#define CPM_FCC_SPECIAL_BASE   ((uint)0x0000B000)
 #define CPM_DATAONLY_SIZE      ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
-#define CPM_DP_NOSPACE         ((uint)0x7fffffff)
-#define CPM_FCC_SPECIAL_BASE   ((uint)0x0000b000)
+#endif
 
 /* The number of pages of host memory we allocate for CPM.  This is
  * done early in kernel initialization to get physically contiguous