diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/include/asm/memory.h | |
parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
download | op-kernel-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.zip op-kernel-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.gz |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/include/asm/memory.h')
-rw-r--r-- | arch/arm/include/asm/memory.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 82df0ae..23c2e8e 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -124,6 +124,15 @@ #endif /* !CONFIG_MMU */ /* + * We fix the TCM memories max 32 KiB ITCM resp DTCM at these + * locations + */ +#ifdef CONFIG_HAVE_TCM +#define ITCM_OFFSET UL(0xfffe0000) +#define DTCM_OFFSET UL(0xfffe8000) +#endif + +/* * Physical vs virtual RAM address space conversion. These are * private definitions which should NOT be used outside memory.h * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. |