diff options
| author | Greg Ungerer | 2011-03-05 12:43:50 +0100 |
|---|---|---|
| committer | Greg Ungerer | 2011-03-15 12:01:53 +0100 |
| commit | f2ba710d17ae221e21a7cccddbbf5257fd93e9fa (patch) | |
| tree | 77e9b8c494307d2f47c497e5300376d1febecd7a /arch | |
| parent | m68knommu: Select GENERIC_HARDIRQS_NO_DEPRECATED (diff) | |
| download | kernel-qcow2-linux-f2ba710d17ae221e21a7cccddbbf5257fd93e9fa.tar.gz kernel-qcow2-linux-f2ba710d17ae221e21a7cccddbbf5257fd93e9fa.tar.xz kernel-qcow2-linux-f2ba710d17ae221e21a7cccddbbf5257fd93e9fa.zip | |
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')
| -rw-r--r-- | arch/m68k/include/asm/coldfire.h | 1 | ||||
| -rw-r--r-- | arch/m68k/include/asm/m5249sim.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h index 213028cbe110..d70cf0f1c40a 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 4908b118f2fd..6698b0581040 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) */ |