aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
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 213028cbe110..d70cf0f1c40a 100644
--- a/arch/m68k/include/asm/coldfire.h
+++ b/arch/m68k/include/asm/coldfire.h
@@ -31,7 +31,6 @@
31 * This is generally setup by the boards start up code. 31 * This is generally setup by the boards start up code.
32 */ 32 */
33#define MCF_MBAR 0x10000000 33#define MCF_MBAR 0x10000000
34#define MCF_MBAR2 0x80000000
35#if defined(CONFIG_M54xx) 34#if defined(CONFIG_M54xx)
36#define MCF_IPSBAR MCF_MBAR 35#define MCF_IPSBAR MCF_MBAR
37#elif defined(CONFIG_M520x) 36#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 @@
17#include <asm/m52xxacr.h> 17#include <asm/m52xxacr.h>
18 18
19/* 19/*
20 * The 5249 has a second MBAR region, define its address.
21 */
22#define MCF_MBAR2 0x80000000
23
24/*
20 * Define the 5249 SIM register set addresses. 25 * Define the 5249 SIM register set addresses.
21 */ 26 */
22#define MCFSIM_RSR 0x00 /* Reset Status reg (r/w) */ 27#define MCFSIM_RSR 0x00 /* Reset Status reg (r/w) */