Commit ddc5bfdb authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1035 from sandrine-bailleux-arm/sb/xlat-lib-ctx

Translation table library v2 improvements
Showing with 11 additions and 3 deletions
+11 -3
...@@ -36,6 +36,10 @@ arm_config_t arm_config; ...@@ -36,6 +36,10 @@ arm_config_t arm_config;
DEVICE1_SIZE, \ DEVICE1_SIZE, \
MT_DEVICE | MT_RW | MT_SECURE) MT_DEVICE | MT_RW | MT_SECURE)
/*
* Need to be mapped with write permissions in order to set a new non-volatile
* counter value.
*/
#define MAP_DEVICE2 MAP_REGION_FLAT(DEVICE2_BASE, \ #define MAP_DEVICE2 MAP_REGION_FLAT(DEVICE2_BASE, \
DEVICE2_SIZE, \ DEVICE2_SIZE, \
MT_DEVICE | MT_RW | MT_SECURE) MT_DEVICE | MT_RW | MT_SECURE)
...@@ -56,8 +60,10 @@ const mmap_region_t plat_arm_mmap[] = { ...@@ -56,8 +60,10 @@ const mmap_region_t plat_arm_mmap[] = {
V2M_MAP_IOFPGA, V2M_MAP_IOFPGA,
MAP_DEVICE0, MAP_DEVICE0,
MAP_DEVICE1, MAP_DEVICE1,
MAP_DEVICE2,
#if TRUSTED_BOARD_BOOT #if TRUSTED_BOARD_BOOT
/* To access the Root of Trust Public Key registers. */
MAP_DEVICE2,
/* Map DRAM to authenticate NS_BL2U image. */
ARM_MAP_NS_DRAM1, ARM_MAP_NS_DRAM1,
#endif #endif
{0} {0}
...@@ -70,9 +76,12 @@ const mmap_region_t plat_arm_mmap[] = { ...@@ -70,9 +76,12 @@ const mmap_region_t plat_arm_mmap[] = {
V2M_MAP_IOFPGA, V2M_MAP_IOFPGA,
MAP_DEVICE0, MAP_DEVICE0,
MAP_DEVICE1, MAP_DEVICE1,
MAP_DEVICE2,
ARM_MAP_NS_DRAM1, ARM_MAP_NS_DRAM1,
ARM_MAP_TSP_SEC_MEM, ARM_MAP_TSP_SEC_MEM,
#if TRUSTED_BOARD_BOOT
/* To access the Root of Trust Public Key registers. */
MAP_DEVICE2,
#endif
#if ARM_BL31_IN_DRAM #if ARM_BL31_IN_DRAM
ARM_MAP_BL31_SEC_DRAM, ARM_MAP_BL31_SEC_DRAM,
#endif #endif
......
...@@ -38,7 +38,6 @@ IO_SOURCES := drivers/io/io_block.c \ ...@@ -38,7 +38,6 @@ IO_SOURCES := drivers/io/io_block.c \
# common sources for BL1, BL2, BL31 # common sources for BL1, BL2, BL31
PLAT_BL_COMMON_SOURCES += drivers/console/aarch64/console.S \ PLAT_BL_COMMON_SOURCES += drivers/console/aarch64/console.S \
lib/xlat_tables_v2/aarch64/xlat_tables_arch.c \ lib/xlat_tables_v2/aarch64/xlat_tables_arch.c \
lib/xlat_tables_v2/xlat_tables_common.c \
lib/xlat_tables_v2/xlat_tables_internal.c \ lib/xlat_tables_v2/xlat_tables_internal.c \
$(PLAT_PATH)/uniphier_console.S \ $(PLAT_PATH)/uniphier_console.S \
$(PLAT_PATH)/uniphier_helpers.S \ $(PLAT_PATH)/uniphier_helpers.S \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment