summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-03-05 21:43:50 +1000
committerGreg Ungerer <gerg@uclinux.org>2011-03-15 21:01:53 +1000
commitf2ba710d17ae221e21a7cccddbbf5257fd93e9fa (patch)
tree77e9b8c494307d2f47c497e5300376d1febecd7a /arch/m68k
parentd3ff2c22a5e5d0bb485f4474b67e0a0f2c426c65 (diff)
downloadop-kernel-dev-f2ba710d17ae221e21a7cccddbbf5257fd93e9fa.zip
op-kernel-dev-f2ba710d17ae221e21a7cccddbbf5257fd93e9fa.tar.gz
m68knommu: move ColdFire 5249 MBAR2 definition
The MBAR2 register is only used on the ColdFire 5249 part, so move its definition out of the common coldfire.h and into the 5249 support header. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/coldfire.h1
-rw-r--r--arch/m68k/include/asm/m5249sim.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h
index 213028c..d70cf0f 100644
--- a/arch/m68k/include/asm/coldfire.h
+++ b/arch/m68k/include/asm/coldfire.h
@@ -31,7 +31,6 @@
* This is generally setup by the boards start up code.
*/
#define MCF_MBAR 0x10000000
-#define MCF_MBAR2 0x80000000
#if defined(CONFIG_M54xx)
#define MCF_IPSBAR MCF_MBAR
#elif defined(CONFIG_M520x)
diff --git a/arch/m68k/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h
index 4908b11..6698b05 100644
--- a/arch/m68k/include/asm/m5249sim.h
+++ b/arch/m68k/include/asm/m5249sim.h
@@ -17,6 +17,11 @@
#include <asm/m52xxacr.h>
/*
+ * The 5249 has a second MBAR region, define its address.
+ */
+#define MCF_MBAR2 0x80000000
+
+/*
* Define the 5249 SIM register set addresses.
*/
#define MCFSIM_RSR 0x00 /* Reset Status reg (r/w) */
OpenPOWER on IntegriCloud