diff --git a/src/soc/qualcomm/common/include/soc/symbols_common.h b/src/soc/qualcomm/common/include/soc/symbols_common.h index 461ffb7d0e..9d39db255e 100644 --- a/src/soc/qualcomm/common/include/soc/symbols_common.h +++ b/src/soc/qualcomm/common/include/soc/symbols_common.h @@ -26,7 +26,10 @@ DECLARE_REGION(dram_modem_extra) DECLARE_REGION(dram_wlan) DECLARE_REGION(dram_wpss) DECLARE_REGION(shrm) +DECLARE_REGION(dram_cpucp_dtbs) DECLARE_REGION(dram_cpucp) DECLARE_REGION(dram_modem) +DECLARE_REGION(dram_tz) +DECLARE_REGION(dram_tz_rem) #endif // _SOC_QUALCOMM_SYMBOLS_COMMON_H_ diff --git a/src/soc/qualcomm/x1p42100/memlayout.ld b/src/soc/qualcomm/x1p42100/memlayout.ld index 0e44bd6e8b..27f4be7e1a 100644 --- a/src/soc/qualcomm/x1p42100/memlayout.ld +++ b/src/soc/qualcomm/x1p42100/memlayout.ld @@ -57,8 +57,12 @@ SECTIONS REGION(shrm, 0x24040000, 128K , 4K) DRAM_START(0x80000000) - REGION(dram_aop, 0x81c00000, 0x0a0000, 0x1000) + REGION(dram_cpucp_dtbs, 0x81240000, 0x2000, 0x1000) + REGION(dram_cpucp, 0x81250000, 0x80000, 0x1000) + REGION(dram_aop, 0x81C00000, 0xF780000, 0x1000) POSTRAM_CBFS_CACHE(0x9F800000, 16M) RAMSTAGE(0xA0800000, 16M) + REGION(dram_tz, 0xD8000000, 0xD6000, 0x1000) BL31(0xD80D6000, 1M) + REGION(dram_tz_rem, 0xD81D6000, 0x72EA000, 0x1000) } diff --git a/src/soc/qualcomm/x1p42100/soc.c b/src/soc/qualcomm/x1p42100/soc.c index 0dd4a4035b..a30c1b0ba4 100644 --- a/src/soc/qualcomm/x1p42100/soc.c +++ b/src/soc/qualcomm/x1p42100/soc.c @@ -15,7 +15,13 @@ static struct device_operations pci_domain_ops = { static void soc_read_resources(struct device *dev) { ram_range(dev, 0, (uintptr_t)region_offset(ddr_region), region_sz(ddr_region)); - reserved_ram_range(dev, 1, (uintptr_t)_dram_aop, REGION_SIZE(dram_aop)); + reserved_ram_range(dev, 1, (uintptr_t)_dram_cpucp_dtbs, REGION_SIZE(dram_cpucp_dtbs)); + reserved_ram_range(dev, 2, (uintptr_t)_dram_cpucp, REGION_SIZE(dram_cpucp)); + + reserved_ram_range(dev, 3, (uintptr_t)_dram_tz, REGION_SIZE(dram_tz)); + reserved_ram_range(dev, 4, (uintptr_t)_dram_tz_rem, REGION_SIZE(dram_tz_rem)); + + reserved_ram_range(dev, 5, (uintptr_t)_dram_aop, REGION_SIZE(dram_aop)); } static void soc_init(struct device *dev)