diff options
| author | Manoj Kumar <manoj.kumar3@arm.com> | 2018-11-13 13:48:39 +0530 |
|---|---|---|
| committer | ronald-cron-arm <39518861+ronald-cron-arm@users.noreply.github.com> | 2018-11-28 18:02:20 +0100 |
| commit | e0e00c8417070c2f904e22be15be855f1f0eafa2 (patch) | |
| tree | 2cbe250b5b87df4459fc54d4a6b4943136b86848 | |
| parent | a6bbbfeab1f2e66456b1b8ce537b3c0951de359a (diff) | |
n1sdp: fix SCP-AP shared memory naming to be consistent with MCP
Change-Id: I9c2e89358e2cea332d1b94bf489de28442a975dd
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
| -rw-r--r-- | product/n1sdp/include/n1sdp_scp_mmap.h | 4 | ||||
| -rw-r--r-- | product/n1sdp/scp_ramfw/config_armv7m_mpu.c | 4 | ||||
| -rw-r--r-- | product/n1sdp/scp_ramfw/config_smt.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/product/n1sdp/include/n1sdp_scp_mmap.h b/product/n1sdp/include/n1sdp_scp_mmap.h index 7cca6b9c..80025b54 100644 --- a/product/n1sdp/include/n1sdp_scp_mmap.h +++ b/product/n1sdp/include/n1sdp_scp_mmap.h @@ -127,8 +127,8 @@ #define CMN600_ROOT_NODE_OFFSET 0xD00000 #define CMN600_ROOTNODE_BASE (SCP_CMN600_BASE + CMN600_ROOT_NODE_OFFSET) -#define SCP_MHU_SECURE_RAM (SCP_SYS0_BASE + 0x05400000) -#define SCP_MHU_NONSECURE_RAM (SCP_SYS0_BASE + 0x05200000) +#define SCP_AP_SHARED_SECURE_RAM (SCP_SYS0_BASE + 0x05400000) +#define SCP_AP_SHARED_NONSECURE_RAM (SCP_SYS0_BASE + 0x05200000) #define SCP_MCP_SHARED_SECURE_RAM (SCP_PERIPHERAL_BASE + 0x01620000) #define SCP_MCP_SHARED_NONSECURE_RAM (SCP_PERIPHERAL_BASE + 0x01610000) diff --git a/product/n1sdp/scp_ramfw/config_armv7m_mpu.c b/product/n1sdp/scp_ramfw/config_armv7m_mpu.c index e135922c..84a92d5f 100644 --- a/product/n1sdp/scp_ramfw/config_armv7m_mpu.c +++ b/product/n1sdp/scp_ramfw/config_armv7m_mpu.c @@ -33,12 +33,12 @@ static const ARM_MPU_Region_t regions[] = { 1, ARM_MPU_AP_PRIV, 0, 1, 1, 1, 0, ARM_MPU_REGION_SIZE_4KB), }, { /* 0x6540_0000 - 0x6540_00FF */ - .RBAR = ARM_MPU_RBAR(4, SCP_MHU_SECURE_RAM), + .RBAR = ARM_MPU_RBAR(4, SCP_AP_SHARED_SECURE_RAM), .RASR = ARM_MPU_RASR( 1, ARM_MPU_AP_PRIV, 0, 1, 1, 1, 0, ARM_MPU_REGION_SIZE_256B), }, { /* 0x6520_0000 - 0x6520_00FF */ - .RBAR = ARM_MPU_RBAR(5, SCP_MHU_NONSECURE_RAM), + .RBAR = ARM_MPU_RBAR(5, SCP_AP_SHARED_NONSECURE_RAM), .RASR = ARM_MPU_RASR( 1, ARM_MPU_AP_PRIV, 0, 1, 1, 1, 0, ARM_MPU_REGION_SIZE_256B), }, diff --git a/product/n1sdp/scp_ramfw/config_smt.c b/product/n1sdp/scp_ramfw/config_smt.c index 07f6771d..48663d94 100644 --- a/product/n1sdp/scp_ramfw/config_smt.c +++ b/product/n1sdp/scp_ramfw/config_smt.c @@ -24,7 +24,7 @@ static const struct fwk_element smt_element_table[] = { .data = &((struct mod_smt_channel_config) { .type = MOD_SMT_CHANNEL_TYPE_SLAVE, .policies = MOD_SMT_POLICY_INIT_MAILBOX | MOD_SMT_POLICY_SECURE, - .mailbox_address = SCP_MHU_SECURE_RAM, + .mailbox_address = SCP_AP_SHARED_SECURE_RAM, .mailbox_size = SCP_SCMI_PAYLOAD_SIZE, .driver_id = FWK_ID_SUB_ELEMENT_INIT(FWK_MODULE_IDX_MHU, N1SDP_MHU_DEVICE_IDX_S_CLUS0, 0), @@ -36,7 +36,7 @@ static const struct fwk_element smt_element_table[] = { .data = &((struct mod_smt_channel_config) { .type = MOD_SMT_CHANNEL_TYPE_SLAVE, .policies = MOD_SMT_POLICY_INIT_MAILBOX, - .mailbox_address = SCP_MHU_NONSECURE_RAM, + .mailbox_address = SCP_AP_SHARED_NONSECURE_RAM, .mailbox_size = SCP_SCMI_PAYLOAD_SIZE, .driver_id = FWK_ID_SUB_ELEMENT_INIT(FWK_MODULE_IDX_MHU, N1SDP_MHU_DEVICE_IDX_NS_CLUS0, 0), |