diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-29 11:36:05 -0500 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-02 03:07:59 -0500 |
| commit | 34101237d975ba37d19cbfe9318984af78332816 (patch) | |
| tree | 39489ffe3311f4b691b493f9a38fb51bba78e421 /arch/arm/plat-mxc/include | |
| parent | 7fc06d8c24fb7915d9cebc9aad7d3b40d8a6ef0b (diff) | |
imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET
This is a further step in allowing to build a kernel image for more
than one imx SOC.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index d3afafdcc0e..002eb91ab23 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h | |||
| @@ -11,21 +11,27 @@ | |||
| 11 | #ifndef __ASM_ARCH_MXC_MEMORY_H__ | 11 | #ifndef __ASM_ARCH_MXC_MEMORY_H__ |
| 12 | #define __ASM_ARCH_MXC_MEMORY_H__ | 12 | #define __ASM_ARCH_MXC_MEMORY_H__ |
| 13 | 13 | ||
| 14 | #if defined CONFIG_ARCH_MX1 | 14 | #define MX1_PHYS_OFFSET UL(0x08000000) |
| 15 | #define PHYS_OFFSET UL(0x08000000) | 15 | #define MX21_PHYS_OFFSET UL(0xc0000000) |
| 16 | #elif defined CONFIG_ARCH_MX2 | 16 | #define MX25_PHYS_OFFSET UL(0x80000000) |
| 17 | #ifdef CONFIG_MACH_MX21 | 17 | #define MX27_PHYS_OFFSET UL(0xa0000000) |
| 18 | #define PHYS_OFFSET UL(0xC0000000) | 18 | #define MX3x_PHYS_OFFSET UL(0x80000000) |
| 19 | #endif | 19 | #define MXC91231_PHYS_OFFSET UL(0x90000000) |
| 20 | #ifdef CONFIG_MACH_MX27 | 20 | |
| 21 | #define PHYS_OFFSET UL(0xA0000000) | 21 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) |
| 22 | #endif | 22 | # if defined CONFIG_ARCH_MX1 |
| 23 | #elif defined CONFIG_ARCH_MX3 | 23 | # define PHYS_OFFSET MX1_PHYS_OFFSET |
| 24 | #define PHYS_OFFSET UL(0x80000000) | 24 | # elif defined CONFIG_MACH_MX21 |
| 25 | #elif defined CONFIG_ARCH_MX25 | 25 | # define PHYS_OFFSET MX21_PHYS_OFFSET |
| 26 | #define PHYS_OFFSET UL(0x80000000) | 26 | # elif defined CONFIG_ARCH_MX25 |
| 27 | #elif defined CONFIG_ARCH_MXC91231 | 27 | # define PHYS_OFFSET MX25_PHYS_OFFSET |
| 28 | #define PHYS_OFFSET UL(0x90000000) | 28 | # elif defined CONFIG_MACH_MX27 |
| 29 | # define PHYS_OFFSET MX27_PHYS_OFFSET | ||
| 30 | # elif defined CONFIG_ARCH_MX3 | ||
| 31 | # define PHYS_OFFSET MX3x_PHYS_OFFSET | ||
| 32 | # elif defined CONFIG_ARCH_MXC91231 | ||
| 33 | # define PHYS_OFFSET MXC91231_PHYS_OFFSET | ||
| 34 | # endif | ||
| 29 | #endif | 35 | #endif |
| 30 | 36 | ||
| 31 | #if defined(CONFIG_MX1_VIDEO) | 37 | #if defined(CONFIG_MX1_VIDEO) |