diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-21 13:47:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-21 13:47:08 +0000 |
| commit | 5ba32a7660051464ed1d56129adf2606db54b5e3 (patch) | |
| tree | 18396ef69588f1b99e3ef62628338e83208397d0 /include/lib | |
| parent | 085c39cf2ea44caa9dbb8b3e9b44f87b849b6263 (diff) | |
| parent | 5dbc783aef2ea0376c98c2b86fd47ff9bc433eab (diff) | |
| download | platform_external_arm-trusted-firmware-5ba32a7660051464ed1d56129adf2606db54b5e3.tar.gz platform_external_arm-trusted-firmware-5ba32a7660051464ed1d56129adf2606db54b5e3.tar.bz2 platform_external_arm-trusted-firmware-5ba32a7660051464ed1d56129adf2606db54b5e3.zip | |
Merge pull request #1828 from uarif1/master
Introduce Versatile Express FVP platform to arm-trusted-firmware.
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_defs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/lib/xlat_tables/xlat_tables_defs.h b/include/lib/xlat_tables/xlat_tables_defs.h index 6d0fb7896..f9bbe0f60 100644 --- a/include/lib/xlat_tables/xlat_tables_defs.h +++ b/include/lib/xlat_tables/xlat_tables_defs.h @@ -73,7 +73,11 @@ #define PAGE_SIZE_MASK (PAGE_SIZE - U(1)) #define IS_PAGE_ALIGNED(addr) (((addr) & PAGE_SIZE_MASK) == U(0)) -#define XLAT_ENTRY_SIZE_SHIFT U(3) /* Each MMU table entry is 8 bytes (1 << 3) */ +#if (ARM_ARCH_MAJOR == 7) && !ARMV7_SUPPORTS_LARGE_PAGE_ADDRESSING +#define XLAT_ENTRY_SIZE_SHIFT U(2) /* Each MMU table entry is 4 bytes */ +#else +#define XLAT_ENTRY_SIZE_SHIFT U(3) /* Each MMU table entry is 8 bytes */ +#endif #define XLAT_ENTRY_SIZE (U(1) << XLAT_ENTRY_SIZE_SHIFT) #define XLAT_TABLE_SIZE_SHIFT PAGE_SIZE_SHIFT /* Size of one complete table */ |