diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2020-03-18 10:38:39 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-18 10:38:39 +0000 |
commit | cfb3f73344217aa000aaff9d84baad7527af75bf (patch) | |
tree | 11f9e4fd03cf59eb503f018e3829a6b44af2cefb | |
parent | 7a20da4380dea0b493806ee12520f26acae992c7 (diff) | |
parent | 493545b3c03979f23a4d97e8191d1081b3ac9171 (diff) | |
download | trusted-firmware-a-cfb3f73344217aa000aaff9d84baad7527af75bf.tar.gz |
Merge "FVP: In BL31/SP_MIN, map only the needed DRAM region statically" into integration
-rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 4 | ||||
-rw-r--r-- | plat/arm/board/fvp/include/platform_def.h | 15 | ||||
-rw-r--r-- | plat/arm/board/fvp/platform.mk | 2 | ||||
-rw-r--r-- | plat/arm/board/fvp/sp_min/sp_min-fvp.mk | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index 33f3067f30..c5fae56d7a 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -135,7 +135,7 @@ const mmap_region_t plat_arm_mmap[] = { ARM_SPM_BUF_EL3_MMAP, #endif /* Required by fconf APIs to read HW_CONFIG dtb loaded into DRAM */ - ARM_MAP_NS_DRAM1, + ARM_DTB_DRAM_NS, {0} }; @@ -163,7 +163,7 @@ const mmap_region_t plat_arm_mmap[] = { MAP_DEVICE0, MAP_DEVICE1, /* Required by fconf APIs to read HW_CONFIG dtb loaded into DRAM */ - ARM_MAP_NS_DRAM1, + ARM_DTB_DRAM_NS, {0} }; #endif diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index 69d49bab4d..1f569c2509 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -52,6 +52,13 @@ #define PLAT_ARM_DRAM2_BASE ULL(0x880000000) #define PLAT_ARM_DRAM2_SIZE UL(0x80000000) +#define PLAT_HW_CONFIG_DTB_BASE ULL(0x82000000) +#define PLAT_HW_CONFIG_DTB_SIZE ULL(0x8000) + +#define ARM_DTB_DRAM_NS MAP_REGION_FLAT( \ + PLAT_HW_CONFIG_DTB_BASE, \ + PLAT_HW_CONFIG_DTB_SIZE, \ + MT_MEMORY | MT_RO | MT_NS) /* * Load address of BL33 for this platform port */ @@ -70,14 +77,14 @@ # else # define PLAT_ARM_MMAP_ENTRIES 9 # if USE_DEBUGFS -# define MAX_XLAT_TABLES 6 +# define MAX_XLAT_TABLES 8 # else -# define MAX_XLAT_TABLES 5 +# define MAX_XLAT_TABLES 7 # endif # endif #elif defined(IMAGE_BL32) # define PLAT_ARM_MMAP_ENTRIES 9 -# define MAX_XLAT_TABLES 5 +# define MAX_XLAT_TABLES 6 #elif !USE_ROMLIB # define PLAT_ARM_MMAP_ENTRIES 11 # define MAX_XLAT_TABLES 5 @@ -126,7 +133,7 @@ * calculated using the current BL31 PROGBITS debug size plus the sizes of * BL2 and BL1-RW */ -#define PLAT_ARM_MAX_BL31_SIZE UL(0x3B000) +#define PLAT_ARM_MAX_BL31_SIZE UL(0x3E000) #endif /* RESET_TO_BL31 */ #ifndef __aarch64__ diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index ca35697e07..4e20632c95 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -206,9 +206,11 @@ BL31_SOURCES += drivers/arm/fvp/fvp_pwrc.c \ # Support for fconf in BL31 # Added separately from the above list for better readability +ifeq ($(filter 1,${BL2_AT_EL3} ${RESET_TO_BL31}),) BL31_SOURCES += common/fdt_wrappers.c \ lib/fconf/fconf.c \ plat/arm/board/fvp/fconf/fconf_hw_config_getter.c +endif ifeq (${FVP_USE_SP804_TIMER},1) BL31_SOURCES += drivers/arm/sp804/sp804_delay_timer.c diff --git a/plat/arm/board/fvp/sp_min/sp_min-fvp.mk b/plat/arm/board/fvp/sp_min/sp_min-fvp.mk index 520a70f992..36bf441ab1 100644 --- a/plat/arm/board/fvp/sp_min/sp_min-fvp.mk +++ b/plat/arm/board/fvp/sp_min/sp_min-fvp.mk @@ -20,8 +20,10 @@ BL32_SOURCES += drivers/arm/fvp/fvp_pwrc.c \ # Support for fconf in SP_MIN(BL32) # Added separately from the above list for better readability +ifeq ($(filter 1,${BL2_AT_EL3} ${RESET_TO_SP_MIN}),) BL32_SOURCES += common/fdt_wrappers.c \ lib/fconf/fconf.c \ plat/arm/board/fvp/fconf/fconf_hw_config_getter.c +endif include plat/arm/common/sp_min/arm_sp_min.mk |