From 245d30efe617af68c674b411d63c680dca1c21dd Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 14 Apr 2023 08:39:49 +0200 Subject: [PATCH] fix(versal): replace FPD_MAINCCI* macros Replace FPD_MAINCCI* macros by PLAT_ARM_CCI* not to have two different names for the same IP. Change-Id: Ia1930e150a51603471051acec5c79c649d57f92f Signed-off-by: Michal Simek --- plat/xilinx/versal/aarch64/versal_common.c | 2 +- plat/xilinx/versal/include/versal_def.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plat/xilinx/versal/aarch64/versal_common.c b/plat/xilinx/versal/aarch64/versal_common.c index ed7f27003..1167d343c 100644 --- a/plat/xilinx/versal/aarch64/versal_common.c +++ b/plat/xilinx/versal/aarch64/versal_common.c @@ -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(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(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), { 0 } }; diff --git a/plat/xilinx/versal/include/versal_def.h b/plat/xilinx/versal/include/versal_def.h index ce4d98c32..2ba04229e 100644 --- a/plat/xilinx/versal/include/versal_def.h +++ b/plat/xilinx/versal/include/versal_def.h @@ -50,6 +50,7 @@ * CCI-400 related constants ******************************************************************************/ #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_CLUSTER1_SL_IFACE_IX 5 @@ -110,9 +111,6 @@ #define CRF_RST_APU_ACPU_RESET (1 << 0) #define CRF_RST_APU_ACPU_PWRON_RESET (1 << 10) -#define FPD_MAINCCI_BASE 0xFD000000 -#define FPD_MAINCCI_SIZE 0x00100000 - /* APU registers and bitfields */ #define FPD_APU_BASE 0xFD5C0000U #define FPD_APU_CONFIG_0 (FPD_APU_BASE + 0x20U)