diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-03-18 17:38:14 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2010-12-17 12:09:57 -0500 |
| commit | 0ad512d42957c14b97e16bdc447d63bb3f685d3a (patch) | |
| tree | 9c50cee5c016096ae6b0417ecc08309c18566abc /arch/arm/plat-mxc/include/mach | |
| parent | 23c25aad8411c8467d1ff4ccaa060fba55c21893 (diff) | |
ENGR00121762-1 mx5: enable run-time physoffset
This enables a single kernel image on MX5x parts using run-time
phys_offset.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index a70d3ef49042..c9609c4670f7 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -14,6 +14,7 @@ #include <asm/page.h> #include <asm/sizes.h> +#ifndef CONFIG_RUNTIME_PHYS_OFFSET #if defined CONFIG_ARCH_MX1 #define PHYS_OFFSET UL(0x08000000) #elif defined CONFIG_ARCH_MX2 @@ -42,6 +43,7 @@ #ifndef PHYS_OFFSET #define PHYS_OFFSET UL(0x80000000) #endif +#endif /* Size of contiguous memory for DMA and other h/w blocks */ #if defined(CONFIG_MX1_VIDEO) |