Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-03 01:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(neoverse-rd): clean-up nrd_plat_arm_def2.h file

Browse source 
Consolidate and organize platform port definitions within the
nrd_plat_arm_def2.h file. Remove direct references to addresses with
corresponding RoS or CSS definitions.

Signed-off-by: Rohit Mathew <rohit.mathew@arm.com>
Change-Id: Ic43cff90d2cf45760b3f808732754cf7c05a814a
This commit is contained in:
Rohit Mathew 2024-03-19 17:50:36 +00:00
parent 301c01748e
commit a0bd619859
3 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plat/arm/board/neoverse_rd/common/include/nrd2/nrd_css_fw_def2.h
View file

@ -16,6 +16,13 @@
* BL sizes * BL sizes
******************************************************************************/ ******************************************************************************/
#define NRD_CSS_BL1_RW_SIZE UL(64 * 1024) /* 64KB */
#if TRUSTED_BOARD_BOOT
# define NRD_CSS_BL2_SIZE UL(0x20000)
#else
# define NRD_CSS_BL2_SIZE UL(0x14000)
#endif
/* /*
* Since BL31 NOBITS overlays BL2 and BL1-RW, PLAT_ARM_MAX_BL31_SIZE is * Since BL31 NOBITS overlays BL2 and BL1-RW, PLAT_ARM_MAX_BL31_SIZE is
* calculated using the current BL31 PROGBITS debug size plus the sizes of BL2 * calculated using the current BL31 PROGBITS debug size plus the sizes of BL2

44
plat/arm/board/neoverse_rd/common/include/nrd2/nrd_plat_arm_def2.h
View file

@ -94,12 +94,6 @@
* BL sizes * BL sizes
******************************************************************************/ ******************************************************************************/
/*
* PLAT_ARM_MAX_BL1_RW_SIZE is calculated using the current BL1 RW debug size
* plus a little space for growth.
*/
#define PLAT_ARM_MAX_BL1_RW_SIZE UL(64 * 1024) /* 64 KB */
/* /*
* PLAT_ARM_MAX_ROMLIB_RW_SIZE is define to use a full page * PLAT_ARM_MAX_ROMLIB_RW_SIZE is define to use a full page
*/ */
@ -112,6 +106,8 @@
#define PLAT_ARM_MAX_ROMLIB_RO_SIZE UL(0) #define PLAT_ARM_MAX_ROMLIB_RO_SIZE UL(0)
#endif #endif
#define PLAT_ARM_MAX_BL1_RW_SIZE NRD_CSS_BL1_RW_SIZE
/* /*
* PLAT_ARM_MAX_BL2_SIZE is calculated using the current BL2 debug size plus a * PLAT_ARM_MAX_BL2_SIZE is calculated using the current BL2 debug size plus a
* little space for growth. Additional 8KiB space is added per chip in * little space for growth. Additional 8KiB space is added per chip in
@ -119,17 +115,12 @@
* peripheral access which lies in >4TB address space. * peripheral access which lies in >4TB address space.
* *
*/ */
#if TRUSTED_BOARD_BOOT #define PLAT_ARM_MAX_BL2_SIZE (NRD_CSS_BL2_SIZE + \
# define PLAT_ARM_MAX_BL2_SIZE (0x20000 + ((NRD_CHIP_COUNT - 1) * \ ((NRD_CHIP_COUNT - 1) * 0x2000))
0x2000))
#else
# define PLAT_ARM_MAX_BL2_SIZE (0x14000 + ((NRD_CHIP_COUNT - 1) * \
0x2000))
#endif
#define PLAT_ARM_MAX_BL31_SIZE (NRD_CSS_BL31_SIZE + \ #define PLAT_ARM_MAX_BL31_SIZE (NRD_CSS_BL31_SIZE + \
PLAT_ARM_MAX_BL2_SIZE + \ PLAT_ARM_MAX_BL2_SIZE + \
PLAT_ARM_MAX_BL1_RW_SIZE) PLAT_ARM_MAX_BL1_RW_SIZE)
/******************************************************************************* /*******************************************************************************
* Stack sizes * Stack sizes
@ -305,9 +296,10 @@ ENABLE_FEAT_RAS && FFH_SUPPORT
#define PLAT_ARM_MEM_PROTEC_VA_FRAME UL(0xC0000000) #define PLAT_ARM_MEM_PROTEC_VA_FRAME UL(0xC0000000)
#define V2M_SYSREGS_BASE UL(0x0C010000) #define V2M_SYSREGS_BASE NRD_ROS_SYSTEM_PERIPH_BASE + \
#define V2M_FLASH0_BASE UL(0x08000000) UL(0x00010000)
#define V2M_FLASH0_SIZE UL(0x04000000) #define V2M_FLASH0_BASE NRD_ROS_SMC0_BASE
#define V2M_FLASH0_SIZE NRD_ROS_SMC0_SIZE
#define V2M_FLASH_BLOCK_SIZE UL(0x00040000) /* 256 KB */ #define V2M_FLASH_BLOCK_SIZE UL(0x00040000) /* 256 KB */
#define PLAT_ARM_FLASH_IMAGE_BASE V2M_FLASH0_BASE #define PLAT_ARM_FLASH_IMAGE_BASE V2M_FLASH0_BASE
@ -340,7 +332,8 @@ ENABLE_FEAT_RAS && FFH_SUPPORT
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
/* Platform ID address */ /* Platform ID address */
#define BOARD_CSS_PLAT_ID_REG_ADDR UL(0x0EFE00E0) #define BOARD_CSS_PLAT_ID_REG_ADDR NRD_ROS_PLATFORM_PERIPH_BASE + \
UL(0x00FE00E0)
/******************************************************************************* /*******************************************************************************
* ROS peripheral config * ROS peripheral config
@ -360,13 +353,12 @@ ENABLE_FEAT_RAS && FFH_SUPPORT
#define SOC_CSS_NIC400_BASE UL(0x0ED00000) #define SOC_CSS_NIC400_BASE UL(0x0ED00000)
/* Non-volatile counters */ /* Non-volatile counters */
#define SOC_TRUSTED_NVCTR_BASE UL(0x0EE70000) #define SOC_TRUSTED_NVCTR_BASE NRD_ROS_PLATFORM_PERIPH_BASE + \
#define TFW_NVCTR_BASE (SOC_TRUSTED_NVCTR_BASE +\ UL(0x00E70000)
0x0000) #define TFW_NVCTR_BASE (SOC_TRUSTED_NVCTR_BASE + 0x0000)
#define TFW_NVCTR_SIZE U(4) #define TFW_NVCTR_SIZE U(4)
#define NTFW_CTR_BASE (SOC_TRUSTED_NVCTR_BASE +\ #define NTFW_CTR_BASE (SOC_TRUSTED_NVCTR_BASE + 0x0004)
0x0004) #define NTFW_CTR_SIZE U(4)
#define NTFW_CTR_SIZE U(4)
/* Keys */ /* Keys */
#define SOC_KEYS_BASE UL(0x0EE80000) #define SOC_KEYS_BASE UL(0x0EE80000)

4
plat/arm/board/neoverse_rd/common/include/nrd2/nrd_ros_def2.h
View file

@ -34,4 +34,8 @@
#define NRD_ROS_PLATFORM_PERIPH_BASE UL(0x0E000000) #define NRD_ROS_PLATFORM_PERIPH_BASE UL(0x0E000000)
#define NRD_ROS_PLATFORM_PERIPH_SIZE UL(0x02000000) #define NRD_ROS_PLATFORM_PERIPH_SIZE UL(0x02000000)
/* SMC0 */
#define NRD_ROS_SMC0_BASE UL(0x08000000)
#define NRD_ROS_SMC0_SIZE UL(0x04000000)
#endif /* NRD_ROS_DEF2_H */ #endif /* NRD_ROS_DEF2_H */