diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 12:50:31 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 12:50:31 +0000 |
| commit | 35c28cc9c9cf90b76ecb3d47637b566d37beb64c (patch) | |
| tree | e2f76e53a56deb157330f8e1d5d54b5a2df819a8 /plat/intel | |
| parent | a91e90432448743890eedf064fbe3bba79b27dd2 (diff) | |
| parent | 600db4e338b87e5cc32f947ed4b66a4c19aab60b (diff) | |
Merge "intel: stratix10: Fix BL31 memory mapping" into integration
Diffstat (limited to 'plat/intel')
| -rw-r--r-- | plat/intel/soc/stratix10/bl31_plat_setup.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/plat/intel/soc/stratix10/bl31_plat_setup.c b/plat/intel/soc/stratix10/bl31_plat_setup.c index 21a37087..fcc46204 100644 --- a/plat/intel/soc/stratix10/bl31_plat_setup.c +++ b/plat/intel/soc/stratix10/bl31_plat_setup.c @@ -111,16 +111,21 @@ void bl31_platform_setup(void) } const mmap_region_t plat_stratix10_mmap[] = { - MAP_REGION_FLAT(DRAM_BASE, DRAM_SIZE, MT_MEMORY | MT_RW | MT_NS), - MAP_REGION_FLAT(DEVICE1_BASE, DEVICE1_SIZE, MT_DEVICE | MT_RW | MT_NS), - MAP_REGION_FLAT(DEVICE2_BASE, DEVICE2_SIZE, MT_DEVICE | MT_RW | MT_NS), + MAP_REGION_FLAT(DRAM_BASE, DRAM_SIZE, + MT_MEMORY | MT_RW | MT_NS), + MAP_REGION_FLAT(DEVICE1_BASE, DEVICE1_SIZE, + MT_DEVICE | MT_RW | MT_NS), + MAP_REGION_FLAT(DEVICE2_BASE, DEVICE2_SIZE, + MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(OCRAM_BASE, OCRAM_SIZE, MT_NON_CACHEABLE | MT_RW | MT_SECURE), MAP_REGION_FLAT(DEVICE3_BASE, DEVICE3_SIZE, MT_DEVICE | MT_RW | MT_SECURE), - MAP_REGION_FLAT(MEM64_BASE, MEM64_SIZE, MT_DEVICE | MT_RW | MT_NS), - MAP_REGION_FLAT(DEVICE4_BASE, DEVICE4_SIZE, MT_DEVICE | MT_RW | MT_NS), - {0}, + MAP_REGION_FLAT(MEM64_BASE, MEM64_SIZE, + MT_DEVICE | MT_RW | MT_NS), + MAP_REGION_FLAT(DEVICE4_BASE, DEVICE4_SIZE, + MT_DEVICE | MT_RW | MT_NS), + {0} }; /******************************************************************************* @@ -142,7 +147,7 @@ void bl31_plat_arch_setup(void) BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE, MT_DEVICE | MT_RW | MT_SECURE), #endif - {0}, + {0} }; setup_page_tables(bl_regions, plat_stratix10_mmap); |