diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-03-06 06:53:28 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-03-15 07:01:55 -0400 |
commit | d4852a34e46679f0a36b7c8803eace2b9002cddc (patch) | |
tree | 31023b7b6a81ec743100a5cab54fec3be899925c /arch/m68k | |
parent | b195c47924ba3ff7434ab49412e5b2dab0a973fa (diff) |
m68knommu: make ColdFire internal peripheral region configurable
Most ColdFire CPUs have an internal peripheral set that can be mapped at
a user selectable address. Different ColdFire parts either use an MBAR
register of an IPSBAR register to map the peripheral region. Most boards
use the Freescale default mappings - but not all.
Make the setting of the MBAR or IPSBAR register configurable. And only make
the selection available on the appropriate ColdFire CPU types.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/coldfire.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h index f06a0a439129..98d1d25101f2 100644 --- a/arch/m68k/include/asm/coldfire.h +++ b/arch/m68k/include/asm/coldfire.h | |||
@@ -33,14 +33,17 @@ | |||
33 | * the base address. Some have an IPSBAR register instead, and it | 33 | * the base address. Some have an IPSBAR register instead, and it |
34 | * has slightly different rules on its size and alignment. Some | 34 | * has slightly different rules on its size and alignment. Some |
35 | * parts have fixed addresses and the internal peripherals cannot | 35 | * parts have fixed addresses and the internal peripherals cannot |
36 | * be relocated in the address space. | 36 | * be relocated in the CPU address space. |
37 | * | 37 | * |
38 | * This is generally setup by the boards start up code. | 38 | * The value of MBAR or IPSBAR is config time selectable, we no |
39 | * longer hard define it here. No MBAR or IPSBAR will be defined if | ||
40 | * this part has a fixed peripheral address map. | ||
39 | */ | 41 | */ |
40 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) | 42 | #ifdef CONFIG_MBAR |
41 | #define MCF_IPSBAR 0x40000000 | 43 | #define MCF_MBAR CONFIG_MBAR |
42 | #else | 44 | #endif |
43 | #define MCF_MBAR 0x10000000 | 45 | #ifdef CONFIG_IPSBAR |
46 | #define MCF_IPSBAR CONFIG_IPSBAR | ||
44 | #endif | 47 | #endif |
45 | 48 | ||
46 | /****************************************************************************/ | 49 | /****************************************************************************/ |