diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2023-09-14 09:15:45 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-09-14 09:15:45 +0200 |
| commit | 61412f799ffc7d59b3f777005304d4bade4b58f5 (patch) | |
| tree | 94dcbf4358bb4bf6dbd9af939eafa1b3f0269eca /plat | |
| parent | 512e0be0d44b0af3c6bc98ef561b0513396bc277 (diff) | |
| parent | 03cf4e9aad2774ce221ccfe6f345ffcc8aabee4a (diff) | |
Merge "fix(fvp): conditionally increase XLAT and MMAP table entries" into integration
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/include/platform_def.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index d9fe24fda..826fca290 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -168,8 +168,13 @@ # define MAX_XLAT_TABLES 6 # endif #elif !USE_ROMLIB -# define PLAT_ARM_MMAP_ENTRIES 12 -# define MAX_XLAT_TABLES 6 +# if ENABLE_RME && defined(IMAGE_BL2) +# define PLAT_ARM_MMAP_ENTRIES 12 +# define MAX_XLAT_TABLES 6 +# else +# define PLAT_ARM_MMAP_ENTRIES 11 +# define MAX_XLAT_TABLES 5 +# endif /* (IMAGE_BL2 && ENABLE_RME) */ #else # define PLAT_ARM_MMAP_ENTRIES 12 # if (defined(SPD_tspd) || defined(SPD_opteed) || defined(SPD_spmd)) && \ |