lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'misc' into devel

Browse Source 
Conflicts:
	arch/arm/mm/init.c
This commit is contained in:
Russell King
2010-07-31 14:20:02 +01:00
parent b31fc7af78 08458ef6ee
commit ceb0885d3b
60 changed files with 475 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/include/asm/memory.h
View File

@@ -123,6 +123,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