diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-16 16:49:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-16 16:49:44 -0600 |
| commit | b9fd394c9655312d0cd7e610594100693e22781c (patch) | |
| tree | 6c9ed22eddd6b3de03cd0a75911282e17e996648 /nuttx/arch/arm/src/sama5 | |
| parent | eeb4c68e1af925484de9b939b7f7cf3c0d761fd1 (diff) | |
| download | nuttx-b9fd394c9655312d0cd7e610594100693e22781c.tar.gz nuttx-b9fd394c9655312d0cd7e610594100693e22781c.tar.bz2 nuttx-b9fd394c9655312d0cd7e610594100693e22781c.zip | |
Add a sharable version of arm_virtpgaddr()
Diffstat (limited to 'nuttx/arch/arm/src/sama5')
| -rw-r--r-- | nuttx/arch/arm/src/sama5/Make.defs | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_pgalloc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_pgalloc.h | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/sama5/Make.defs b/nuttx/arch/arm/src/sama5/Make.defs index 6feae083d..ba8012837 100644 --- a/nuttx/arch/arm/src/sama5/Make.defs +++ b/nuttx/arch/arm/src/sama5/Make.defs @@ -104,6 +104,9 @@ endif ifeq ($(CONFIG_MM_PGALLOC),y) CMN_CSRCS += arm_physpgaddr.c +ifeq ($(CONFIG_ARCH_PGPOOL_MAPPING),y) +CMN_CSRCS += arm_virtpgaddr.c +endif endif ifeq ($(CONFIG_ELF),y) diff --git a/nuttx/arch/arm/src/sama5/sam_pgalloc.c b/nuttx/arch/arm/src/sama5/sam_pgalloc.c index a90582cb3..5fbaac8a9 100644 --- a/nuttx/arch/arm/src/sama5/sam_pgalloc.c +++ b/nuttx/arch/arm/src/sama5/sam_pgalloc.c @@ -124,6 +124,7 @@ void up_allocate_pgheap(FAR void **heap_start, size_t *heap_size) * ****************************************************************************/ +#ifndef CONFIG_ARCH_PGPOOL_MAPPING uintptr_t sam_virtpgaddr(uintptr_t paddr) { uintptr_t poolstart; @@ -146,5 +147,6 @@ uintptr_t sam_virtpgaddr(uintptr_t paddr) return 0; } +#endif /* !CONFIG_ARCH_PGPOOL_MAPPING */ #endif /* CONFIG_MM_PGALLOC */ diff --git a/nuttx/arch/arm/src/sama5/sam_pgalloc.h b/nuttx/arch/arm/src/sama5/sam_pgalloc.h index b79ba1a85..75f4f90f1 100644 --- a/nuttx/arch/arm/src/sama5/sam_pgalloc.h +++ b/nuttx/arch/arm/src/sama5/sam_pgalloc.h @@ -88,7 +88,11 @@ extern "C" * ****************************************************************************/ +#ifdef CONFIG_ARCH_PGPOOL_MAPPING +# define sam_virtpgaddr(vaddr) arm_virtpgaddr(vaddr) +#else uintptr_t sam_virtpgaddr(uintptr_t paddr); +#endif #undef EXTERN #ifdef __cplusplus |