github
/
arm-trusted-firmware
mirror of https://github.com/ARM-software/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge "fix(versal): replace FPD_MAINCCI* macros" into integration

pull/1994/merge
Joanna Farley 2 years ago
committed by TrustedFirmware Code Review
parent
c629e8d8a2 245d30efe6
commit
114495b548
2 changed files with 2 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      plat/xilinx/versal/aarch64/versal_common.c
  2. 4
      plat/xilinx/versal/include/versal_def.h

2
plat/xilinx/versal/aarch64/versal_common.c
View File

@ -23,7 +23,7 @@ const mmap_region_t plat_versal_mmap[] = {
MAP_REGION_FLAT(DEVICE0_BASE, DEVICE0_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(DEVICE0_BASE, DEVICE0_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
MAP_REGION_FLAT(DEVICE1_BASE, DEVICE1_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(DEVICE1_BASE, DEVICE1_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
MAP_REGION_FLAT(CRF_BASE, CRF_SIZE, MT_DEVICE | MT_RW | MT_SECURE), MAP_REGION_FLAT(CRF_BASE, CRF_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
MAP_REGION_FLAT(FPD_MAINCCI_BASE, FPD_MAINCCI_SIZE, MT_DEVICE | MT_RW | MAP_REGION_FLAT(PLAT_ARM_CCI_BASE, PLAT_ARM_CCI_SIZE, MT_DEVICE | MT_RW |
MT_SECURE), MT_SECURE),
{ 0 } { 0 }
}; };

4
plat/xilinx/versal/include/versal_def.h
View File

@ -50,6 +50,7 @@
* CCI-400 related constants * CCI-400 related constants
******************************************************************************/ ******************************************************************************/
#define PLAT_ARM_CCI_BASE 0xFD000000 #define PLAT_ARM_CCI_BASE 0xFD000000
#define PLAT_ARM_CCI_SIZE 0x00100000
#define PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX 4 #define PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX 4
#define PLAT_ARM_CCI_CLUSTER1_SL_IFACE_IX 5 #define PLAT_ARM_CCI_CLUSTER1_SL_IFACE_IX 5
@ -110,9 +111,6 @@
#define CRF_RST_APU_ACPU_RESET (1 << 0) #define CRF_RST_APU_ACPU_RESET (1 << 0)
#define CRF_RST_APU_ACPU_PWRON_RESET (1 << 10) #define CRF_RST_APU_ACPU_PWRON_RESET (1 << 10)
#define FPD_MAINCCI_BASE 0xFD000000
#define FPD_MAINCCI_SIZE 0x00100000
/* APU registers and bitfields */ /* APU registers and bitfields */
#define FPD_APU_BASE 0xFD5C0000U #define FPD_APU_BASE 0xFD5C0000U
#define FPD_APU_CONFIG_0 (FPD_APU_BASE + 0x20U) #define FPD_APU_CONFIG_0 (FPD_APU_BASE + 0x20U)

Write Preview
Loading…
Cancel
Save