sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5D4: Add missing mappings for the VDEC and L2CC memory regions

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-21 14:25:47 -06:00
parent 4b9666658e
commit 4e3c794363
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/src/sama5/chip/sam_matrix.h
View File

@ -56,6 +56,7 @@
/* These are bits maps of PIDs in the H64MX SPSELR registers. These are used by /* These are bits maps of PIDs in the H64MX SPSELR registers. These are used by
* application code to quickly determine if a given PID is served by H32MX or H64MX * application code to quickly determine if a given PID is served by H32MX or H64MX
* which, in turn, is needed to know if the peripheral secured in SPSELR). * which, in turn, is needed to know if the peripheral secured in SPSELR).
* Reference: "In Matrix" column of "Table 9-1. Peripheral identifiers."
* *
* NOTE that these hard-code bit values must match the PID assignments in * NOTE that these hard-code bit values must match the PID assignments in
* arch/arm/include/sama5/sama5*_irq.h. * arch/arm/include/sama5/sama5*_irq.h.

4
arch/arm/src/sama5/chip/sama5d4x_memorymap.h
View File

@ -254,12 +254,14 @@
#define SAM_BOOTMEM_MMUFLAGS MMU_ROMFLAGS #define SAM_BOOTMEM_MMUFLAGS MMU_ROMFLAGS
#define SAM_ROM_MMUFLAGS MMU_ROMFLAGS #define SAM_ROM_MMUFLAGS MMU_ROMFLAGS
#define SAM_ISRAM_MMUFLAGS MMU_MEMFLAGS #define SAM_ISRAM_MMUFLAGS MMU_MEMFLAGS
#define SAM_SMD_MMUFLAGS MMU_MEMFLAGS #define SAM_VDEC_MMUFLAGS MMU_IOFLAGS
#define SAM_UDPHSRAM_MMUFLAGS MMU_IOFLAGS #define SAM_UDPHSRAM_MMUFLAGS MMU_IOFLAGS
#define SAM_UHPOHCI_MMUFLAGS MMU_IOFLAGS #define SAM_UHPOHCI_MMUFLAGS MMU_IOFLAGS
#define SAM_UHPEHCI_MMUFLAGS MMU_IOFLAGS #define SAM_UHPEHCI_MMUFLAGS MMU_IOFLAGS
#define SAM_AXIMX_MMUFLAGS MMU_IOFLAGS #define SAM_AXIMX_MMUFLAGS MMU_IOFLAGS
#define SAM_DAP_MMUFLAGS MMU_IOFLAGS #define SAM_DAP_MMUFLAGS MMU_IOFLAGS
#define SAM_SMD_MMUFLAGS MMU_MEMFLAGS
#define SAM_L2CC_MMUFLAGS MMU_IOFLAGS
/* If the NFC is not being used, the NFC SRAM can be used as general purpose /* If the NFC is not being used, the NFC SRAM can be used as general purpose
* SRAM (cached). If the NFC is used, then the NFC SRAM should be treated * SRAM (cached). If the NFC is used, then the NFC SRAM should be treated

18
arch/arm/src/sama5/sam_boot.c
View File

@ -188,11 +188,21 @@ static const struct section_mapping_s section_mapping[] =
{ SAM_NFCSRAM_PSECTION, SAM_NFCSRAM_VSECTION, { SAM_NFCSRAM_PSECTION, SAM_NFCSRAM_VSECTION,
SAM_NFCSRAM_MMUFLAGS, SAM_NFCSRAM_NSECTIONS SAM_NFCSRAM_MMUFLAGS, SAM_NFCSRAM_NSECTIONS
}, },
#ifndef CONFIG_PAGING /* Internal SRAM is already fully mapped */ #ifndef CONFIG_PAGING /* Internal SRAM is already fully mapped */
{ SAM_ISRAM_PSECTION, SAM_ISRAM_VSECTION, { SAM_ISRAM_PSECTION, SAM_ISRAM_VSECTION,
SAM_ISRAM_MMUFLAGS, SAM_ISRAM_NSECTIONS SAM_ISRAM_MMUFLAGS, SAM_ISRAM_NSECTIONS
}, },
#endif #endif
#ifdef SAM_VDEC_PSECTION
/* If the memory map supports a video decoder (VDEC), then map it */
{ SAM_VDEC_PSECTION, SAM_VDEC_VSECTION,
SAM_VDEC_MMUFLAGS, SAM_VDEC_NSECTIONS
},
#endif
{ SAM_SMD_PSECTION, SAM_SMD_VSECTION, { SAM_SMD_PSECTION, SAM_SMD_VSECTION,
SAM_SMD_MMUFLAGS, SAM_SMD_NSECTIONS SAM_SMD_MMUFLAGS, SAM_SMD_NSECTIONS
}, },
@ -212,6 +222,14 @@ static const struct section_mapping_s section_mapping[] =
SAM_DAP_MMUFLAGS, SAM_DAP_NSECTIONS SAM_DAP_MMUFLAGS, SAM_DAP_NSECTIONS
}, },
#ifdef SAM_L2CC_PSECTION
/* If the memory map supports an L2 cache controller (L2CC), then map it */
{ SAM_L2CC_PSECTION, SAM_L2CC_VSECTION,
SAM_L2CC_MMUFLAGS, SAM_L2CC_NSECTIONS
},
#endif
/* SAMA5 CS0 External Memories */ /* SAMA5 CS0 External Memories */
#ifdef CONFIG_SAMA5_EBICS0 #ifdef CONFIG_SAMA5_EBICS0