arm-bsp/trusted-firmware-a: corstone1000: remove unused patch files
PATCH 1/2 arm-bsp/trusted-firmware-a: corstone1000: remove unused patch files
commit 24db3b56ba1285e4196da9416a8914c5bcaf8fd4 removed references to the patches, but did not remove the patches.
--- .../0001-Rename-Diphda-to-corstone1000.patch | 587 ------------------ ...e1000-made-changes-to-accommodate-3M.patch | 201 ------ ...plement-platform-specific-psci-reset.patch | 60 -- ...change-base-address-of-FIP-in-the-fl.patch | 33 - ...identify-which-bank-to-load-fip-from.patch | 102 --- 5 files changed, 983 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0001-Rename-Diphda-to-corstone1000.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-plat-arm-corstone1000-made-changes-to-accommodate-3M.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-corstone1000-implement-platform-specific-psci-reset.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0004-plat-arm-corstone1000-change-base-address-of-FIP-in-the-fl.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0005-plat-arm-corstone1000-identify-which-bank-to-load-fip-from.patch
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0001-Rename-Diphda-to-corstone1000.patch deleted +0 -587
@@ -1,587 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Arpita S.K <[email protected]> - -From b4d59c85d1045998275cd219efe5849803c2c616 Mon Sep 17 00:00:00 2001 -From: "Arpita S.K" <[email protected]> -Date: Wed, 13 Oct 2021 18:05:11 +0530 -Subject: [PATCH] Rename Diphda to corstone1000 - -Replace all the instances of Diphda as functions, -macros etc. with corstone1000 - -Signed-off-by: Arpita S.K <[email protected]> ---- - docs/about/maintainers.rst | 2 +- - .../arm/{diphda => corstone1000}/index.rst | 6 +- - docs/plat/arm/index.rst | 2 +- - plat/arm/board/common/rotpk/arm_dev_rotpk.S | 2 +- - .../corstone1000_bl2_mem_params_desc.c} | 8 +- - .../common/corstone1000_err.c} | 2 +- - .../common/corstone1000_helpers.S} | 4 +- - .../common/corstone1000_plat.c} | 6 +- - .../common/corstone1000_pm.c} | 0 - .../common/corstone1000_security.c} | 0 - .../common/corstone1000_stack_protector.c} | 0 - .../common/corstone1000_topology.c} | 12 +-- - .../common/corstone1000_trusted_boot.c} | 2 +- - .../fdts/corstone1000_spmc_manifest.dts} | 0 - .../common/include/platform_def.h | 52 ++++++------ - .../include/plat_macros.S | 0 - plat/arm/board/corstone1000/platform.mk | 83 +++++++++++++++++++ - plat/arm/board/diphda/platform.mk | 83 ------------------- - 18 files changed, 132 insertions(+), 132 deletions(-) - rename docs/plat/arm/{diphda => corstone1000}/index.rst (93%) - rename plat/arm/board/{diphda/common/diphda_bl2_mem_params_desc.c => corstone1000/common/corstone1000_bl2_mem_params_desc.c} (92%) - rename plat/arm/board/{diphda/common/diphda_err.c => corstone1000/common/corstone1000_err.c} (89%) - rename plat/arm/board/{diphda/common/diphda_helpers.S => corstone1000/common/corstone1000_helpers.S} (94%) - rename plat/arm/board/{diphda/common/diphda_plat.c => corstone1000/common/corstone1000_plat.c} (92%) - rename plat/arm/board/{diphda/common/diphda_pm.c => corstone1000/common/corstone1000_pm.c} (100%) - rename plat/arm/board/{diphda/common/diphda_security.c => corstone1000/common/corstone1000_security.c} (100%) - rename plat/arm/board/{diphda/common/diphda_stack_protector.c => corstone1000/common/corstone1000_stack_protector.c} (100%) - rename plat/arm/board/{diphda/common/diphda_topology.c => corstone1000/common/corstone1000_topology.c} (77%) - rename plat/arm/board/{diphda/common/diphda_trusted_boot.c => corstone1000/common/corstone1000_trusted_boot.c} (97%) - rename plat/arm/board/{diphda/common/fdts/diphda_spmc_manifest.dts => corstone1000/common/fdts/corstone1000_spmc_manifest.dts} (100%) - rename plat/arm/board/{diphda => corstone1000}/common/include/platform_def.h (89%) - rename plat/arm/board/{diphda => corstone1000}/include/plat_macros.S (100%) - create mode 100644 plat/arm/board/corstone1000/platform.mk - delete mode 100644 plat/arm/board/diphda/platform.mk - -diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst -index 07f258c774..2d9eb1440d 100644 ---- a/docs/about/maintainers.rst -+++ b/docs/about/maintainers.rst -@@ -399,7 +399,7 @@ Arm Rich IoT Platform ports - :|G|: `vishnu-banavath`_ - :|F|: plat/arm/board/corstone700 - :|F|: plat/arm/board/a5ds --:|F|: plat/arm/board/diphda -+:|F|: plat/arm/board/corstone1000 - - Arm Reference Design platform ports - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -diff --git a/docs/plat/arm/diphda/index.rst b/docs/plat/arm/corstone1000/index.rst -similarity index 93% -rename from docs/plat/arm/diphda/index.rst -rename to docs/plat/arm/corstone1000/index.rst -index 27afda43f5..b889b7f2e9 100644 ---- a/docs/plat/arm/diphda/index.rst -+++ b/docs/plat/arm/corstone1000/index.rst -@@ -1,7 +1,7 @@ --Diphda Platform -+Corstone1000 Platform - ========================== - --Some of the features of the Diphda platform referenced in TF-A include: -+Some of the features of the Corstone1000 platform referenced in TF-A include: - - - Cortex-A35 application processor (64-bit mode) - - Secure Enclave -@@ -37,7 +37,7 @@ Build Procedure (TF-A only) - CC=aarch64-none-elf-gcc \ - V=1 \ - BUILD_BASE=<path to the build folder> \ -- PLAT=diphda \ -+ PLAT=corstone1000 \ - SPD=spmd \ - SPMD_SPM_AT_SEL2=0 \ - DEBUG=1 \ -diff --git a/docs/plat/arm/index.rst b/docs/plat/arm/index.rst -index c834f6ae70..23c561ff57 100644 ---- a/docs/plat/arm/index.rst -+++ b/docs/plat/arm/index.rst -@@ -12,7 +12,7 @@ Arm Development Platforms - arm_fpga/index - arm-build-options - morello/index -- diphda/index -+ corstone1000/index - - This chapter holds documentation related to Arm's development platforms, - including both software models (FVPs) and hardware development boards -diff --git a/plat/arm/board/common/rotpk/arm_dev_rotpk.S b/plat/arm/board/common/rotpk/arm_dev_rotpk.S -index 38f91fe5f8..125ddf67c7 100644 ---- a/plat/arm/board/common/rotpk/arm_dev_rotpk.S -+++ b/plat/arm/board/common/rotpk/arm_dev_rotpk.S -@@ -4,7 +4,7 @@ - * SPDX-License-Identifier: BSD-3-Clause - */ - --/* diphda platform provides custom values for the macros defined in -+/* corstone1000 platform provides custom values for the macros defined in - * arm_def.h , so only platform_def.h needs to be included - */ - #if !defined(TARGET_PLATFORM_FVP) && !defined(TARGET_PLATFORM_FPGA) -diff --git a/plat/arm/board/diphda/common/diphda_bl2_mem_params_desc.c b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -similarity index 92% -rename from plat/arm/board/diphda/common/diphda_bl2_mem_params_desc.c -rename to plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -index 916c868d21..7baa82d31b 100644 ---- a/plat/arm/board/diphda/common/diphda_bl2_mem_params_desc.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -@@ -44,7 +44,7 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { - SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, - VERSION_2, entry_point_info_t, SECURE | EXECUTABLE), - .ep_info.pc = BL32_BASE, -- .ep_info.args.arg0 = DIPHDA_TOS_FW_CONFIG_BASE, -+ .ep_info.args.arg0 = CORSTONE1000_TOS_FW_CONFIG_BASE, - SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, - VERSION_2, image_info_t, 0), - .image_info.image_base = BL32_BASE, -@@ -56,9 +56,9 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { - /* Fill TOS_FW_CONFIG related information */ - { - .image_id = TOS_FW_CONFIG_ID, -- .image_info.image_base = DIPHDA_TOS_FW_CONFIG_BASE, -- .image_info.image_max_size = DIPHDA_TOS_FW_CONFIG_LIMIT - \ -- DIPHDA_TOS_FW_CONFIG_BASE, -+ .image_info.image_base = CORSTONE1000_TOS_FW_CONFIG_BASE, -+ .image_info.image_max_size = CORSTONE1000_TOS_FW_CONFIG_LIMIT - \ -+ CORSTONE1000_TOS_FW_CONFIG_BASE, - SET_STATIC_PARAM_HEAD(ep_info, PARAM_IMAGE_BINARY, - VERSION_2, entry_point_info_t, SECURE | NON_EXECUTABLE), - SET_STATIC_PARAM_HEAD(image_info, PARAM_IMAGE_BINARY, -diff --git a/plat/arm/board/diphda/common/diphda_err.c b/plat/arm/board/corstone1000/common/corstone1000_err.c -similarity index 89% -rename from plat/arm/board/diphda/common/diphda_err.c -rename to plat/arm/board/corstone1000/common/corstone1000_err.c -index 89a3b8249c..5f8e7da437 100644 ---- a/plat/arm/board/diphda/common/diphda_err.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_err.c -@@ -7,7 +7,7 @@ - #include <plat/arm/common/plat_arm.h> - - /* -- * diphda error handler -+ * corstone1000 error handler - */ - void __dead2 plat_arm_error_handler(int err) - { -diff --git a/plat/arm/board/diphda/common/diphda_helpers.S b/plat/arm/board/corstone1000/common/corstone1000_helpers.S -similarity index 94% -rename from plat/arm/board/diphda/common/diphda_helpers.S -rename to plat/arm/board/corstone1000/common/corstone1000_helpers.S -index c9d2a88de9..87122270b0 100644 ---- a/plat/arm/board/diphda/common/diphda_helpers.S -+++ b/plat/arm/board/corstone1000/common/corstone1000_helpers.S -@@ -29,7 +29,7 @@ endfunc plat_secondary_cold_boot_setup - * unsigned long plat_get_my_entrypoint (void); - * - * Main job of this routine is to distinguish between a cold and warm -- * boot. On diphda, this information can be queried from the power -+ * boot. On corstone1000, this information can be queried from the power - * controller. The Power Control SYS Status Register (PSYSR) indicates - * the wake-up reason for the CPU. - * -@@ -61,7 +61,7 @@ func plat_is_my_cpu_primary - mrs x0, mpidr_el1 - mov_imm x1, MPIDR_AFFINITY_MASK - and x0, x0, x1 -- cmp x0, #DIPHDA_PRIMARY_CPU -+ cmp x0, #CORSTONE1000_PRIMARY_CPU - cset w0, eq - ret - endfunc plat_is_my_cpu_primary -diff --git a/plat/arm/board/diphda/common/diphda_plat.c b/plat/arm/board/corstone1000/common/corstone1000_plat.c -similarity index 92% -rename from plat/arm/board/diphda/common/diphda_plat.c -rename to plat/arm/board/corstone1000/common/corstone1000_plat.c -index 28d15a59e6..7a38b0b2ee 100644 ---- a/plat/arm/board/diphda/common/diphda_plat.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_plat.c -@@ -21,12 +21,12 @@ const mmap_region_t plat_arm_mmap[] = { - ARM_MAP_SHARED_RAM, - ARM_MAP_NS_SHARED_RAM, - ARM_MAP_NS_DRAM1, -- DIPHDA_MAP_DEVICE, -- DIPHDA_EXTERNAL_FLASH, -+ CORSTONE1000_MAP_DEVICE, -+ CORSTONE1000_EXTERNAL_FLASH, - {0} - }; - --/* diphda only has one always-on power domain and there -+/* corstone1000 only has one always-on power domain and there - * is no power control present - */ - void __init plat_arm_pwrc_setup(void) -diff --git a/plat/arm/board/diphda/common/diphda_pm.c b/plat/arm/board/corstone1000/common/corstone1000_pm.c -similarity index 100% -rename from plat/arm/board/diphda/common/diphda_pm.c -rename to plat/arm/board/corstone1000/common/corstone1000_pm.c -diff --git a/plat/arm/board/diphda/common/diphda_security.c b/plat/arm/board/corstone1000/common/corstone1000_security.c -similarity index 100% -rename from plat/arm/board/diphda/common/diphda_security.c -rename to plat/arm/board/corstone1000/common/corstone1000_security.c -diff --git a/plat/arm/board/diphda/common/diphda_stack_protector.c b/plat/arm/board/corstone1000/common/corstone1000_stack_protector.c -similarity index 100% -rename from plat/arm/board/diphda/common/diphda_stack_protector.c -rename to plat/arm/board/corstone1000/common/corstone1000_stack_protector.c -diff --git a/plat/arm/board/diphda/common/diphda_topology.c b/plat/arm/board/corstone1000/common/corstone1000_topology.c -similarity index 77% -rename from plat/arm/board/diphda/common/diphda_topology.c -rename to plat/arm/board/corstone1000/common/corstone1000_topology.c -index 9dfd05d091..2a3b6913a1 100644 ---- a/plat/arm/board/diphda/common/diphda_topology.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_topology.c -@@ -7,8 +7,8 @@ - #include <plat/arm/common/plat_arm.h> - #include <plat/common/platform.h> - --/* The diphda power domain tree descriptor */ --static unsigned char diphda_power_domain_tree_desc[PLAT_ARM_CLUSTER_COUNT -+/* The corstone1000 power domain tree descriptor */ -+static unsigned char corstone1000_power_domain_tree_desc[PLAT_ARM_CLUSTER_COUNT - + 2]; - /******************************************************************************* - * This function dynamically constructs the topology according to -@@ -22,13 +22,13 @@ const unsigned char *plat_get_power_domain_tree_desc(void) - * The highest level is the system level. The next level is constituted - * by clusters and then cores in clusters. - */ -- diphda_power_domain_tree_desc[0] = 1; -- diphda_power_domain_tree_desc[1] = PLAT_ARM_CLUSTER_COUNT; -+ corstone1000_power_domain_tree_desc[0] = 1; -+ corstone1000_power_domain_tree_desc[1] = PLAT_ARM_CLUSTER_COUNT; - - for (i = 0; i < PLAT_ARM_CLUSTER_COUNT; i++) -- diphda_power_domain_tree_desc[i + 2] = PLATFORM_CORE_COUNT; -+ corstone1000_power_domain_tree_desc[i + 2] = PLATFORM_CORE_COUNT; - -- return diphda_power_domain_tree_desc; -+ return corstone1000_power_domain_tree_desc; - } - - /****************************************************************************** -diff --git a/plat/arm/board/diphda/common/diphda_trusted_boot.c b/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c -similarity index 97% -rename from plat/arm/board/diphda/common/diphda_trusted_boot.c -rename to plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c -index ddb41faa6b..2e2e9475a5 100644 ---- a/plat/arm/board/diphda/common/diphda_trusted_boot.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c -@@ -38,7 +38,7 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, - */ - int plat_get_nv_ctr(void *cookie, unsigned int *nv_ctr) - { -- *nv_ctr = DIPHDA_FW_NVCTR_VAL; -+ *nv_ctr = CORSTONE1000_FW_NVCTR_VAL; - return 0; - } - -diff --git a/plat/arm/board/diphda/common/fdts/diphda_spmc_manifest.dts b/plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts -similarity index 100% -rename from plat/arm/board/diphda/common/fdts/diphda_spmc_manifest.dts -rename to plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts -diff --git a/plat/arm/board/diphda/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h -similarity index 89% -rename from plat/arm/board/diphda/common/include/platform_def.h -rename to plat/arm/board/corstone1000/common/include/platform_def.h -index 37fd71b6aa..e36bb626ee 100644 ---- a/plat/arm/board/diphda/common/include/platform_def.h -+++ b/plat/arm/board/corstone1000/common/include/platform_def.h -@@ -34,17 +34,17 @@ - #define V2M_IOFPGA_UART0_CLK_IN_HZ 50000000 - #define V2M_IOFPGA_UART1_CLK_IN_HZ 50000000 - --/* Core/Cluster/Thread counts for diphda */ --#define DIPHDA_CLUSTER_COUNT U(1) --#define DIPHDA_MAX_CPUS_PER_CLUSTER U(4) --#define DIPHDA_MAX_PE_PER_CPU U(1) --#define DIPHDA_PRIMARY_CPU U(0) -+/* Core/Cluster/Thread counts for corstone1000 */ -+#define CORSTONE1000_CLUSTER_COUNT U(1) -+#define CORSTONE1000_MAX_CPUS_PER_CLUSTER U(4) -+#define CORSTONE1000_MAX_PE_PER_CPU U(1) -+#define CORSTONE1000_PRIMARY_CPU U(0) - --#define PLAT_ARM_CLUSTER_COUNT DIPHDA_CLUSTER_COUNT -+#define PLAT_ARM_CLUSTER_COUNT CORSTONE1000_CLUSTER_COUNT - - #define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \ -- DIPHDA_MAX_CPUS_PER_CLUSTER * \ -- DIPHDA_MAX_PE_PER_CPU) -+ CORSTONE1000_MAX_CPUS_PER_CLUSTER * \ -+ CORSTONE1000_MAX_PE_PER_CPU) - - /* UART related constants */ - #define PLAT_ARM_BOOT_UART_BASE 0x1a510000 -@@ -85,7 +85,7 @@ - * - * BL32 (optee-os) - * -- * <DIPHDA_TOS_FW_CONFIG_BASE> = 0x20ae000 -+ * <CORSTONE1000_TOS_FW_CONFIG_BASE> = 0x20ae000 - * - * partition size: 8 KB - * -@@ -132,7 +132,7 @@ - #define ARM_DRAM1_END (ARM_DRAM1_BASE + \ - ARM_DRAM1_SIZE - 1) - --/* DRAM1 and DRAM2 are the same for diphda */ -+/* DRAM1 and DRAM2 are the same for corstone1000 */ - #define ARM_DRAM2_BASE ARM_DRAM1_BASE - #define ARM_DRAM2_SIZE ARM_DRAM1_SIZE - #define ARM_DRAM2_END ARM_DRAM1_END -@@ -173,13 +173,13 @@ - PLAT_ARM_MAX_BL31_SIZE) - #define BL31_LIMIT BL2_SIGNATURE_BASE - --#define DIPHDA_TOS_FW_CONFIG_BASE (BL31_BASE - \ -- DIPHDA_TOS_FW_CONFIG_SIZE) --#define DIPHDA_TOS_FW_CONFIG_SIZE UL(0x00002000) /* 8 KB */ --#define DIPHDA_TOS_FW_CONFIG_LIMIT BL31_BASE -+#define CORSTONE1000_TOS_FW_CONFIG_BASE (BL31_BASE - \ -+ CORSTONE1000_TOS_FW_CONFIG_SIZE) -+#define CORSTONE1000_TOS_FW_CONFIG_SIZE UL(0x00002000) /* 8 KB */ -+#define CORSTONE1000_TOS_FW_CONFIG_LIMIT BL31_BASE - - #define BL32_BASE ARM_BL_RAM_BASE --#define PLAT_ARM_MAX_BL32_SIZE (DIPHDA_TOS_FW_CONFIG_BASE - \ -+#define PLAT_ARM_MAX_BL32_SIZE (CORSTONE1000_TOS_FW_CONFIG_BASE - \ - BL32_BASE) /* 688 KB */ - #define BL32_LIMIT (BL32_BASE + \ - PLAT_ARM_MAX_BL32_SIZE) -@@ -220,7 +220,7 @@ - /* - * Define FW_CONFIG area base and limit. Leave enough space for BL2 meminfo. - * FW_CONFIG is intended to host the device tree. Currently, This area is not -- * used because diphda platform doesn't use a device tree at TF-A level. -+ * used because corstone1000 platform doesn't use a device tree at TF-A level. - */ - #define ARM_FW_CONFIG_BASE (ARM_SHARED_RAM_BASE \ - + sizeof(meminfo_t)) -@@ -261,8 +261,8 @@ - - #define SYS_COUNTER_FREQ_IN_TICKS UL(50000000) /* 50MHz */ - --#define DIPHDA_IRQ_TZ_WDOG 32 --#define DIPHDA_IRQ_SEC_SYS_TIMER 34 -+#define CORSTONE1000_IRQ_TZ_WDOG 32 -+#define CORSTONE1000_IRQ_SEC_SYS_TIMER 34 - - #define PLAT_MAX_PWR_LVL 2 - /* -@@ -308,7 +308,7 @@ - - #define PLATFORM_STACK_SIZE UL(0x440) - --#define DIPHDA_EXTERNAL_FLASH MAP_REGION_FLAT( \ -+#define CORSTONE1000_EXTERNAL_FLASH MAP_REGION_FLAT( \ - PLAT_ARM_NVM_BASE, \ - PLAT_ARM_NVM_SIZE, \ - MT_DEVICE | MT_RO | MT_SECURE) -@@ -356,11 +356,11 @@ - ARM_FW_CONFIG_BASE), \ - MT_MEMORY | MT_RW | MT_SECURE) - --#define DIPHDA_DEVICE_BASE (0x1A000000) --#define DIPHDA_DEVICE_SIZE (0x26000000) --#define DIPHDA_MAP_DEVICE MAP_REGION_FLAT( \ -- DIPHDA_DEVICE_BASE, \ -- DIPHDA_DEVICE_SIZE, \ -+#define CORSTONE1000_DEVICE_BASE (0x1A000000) -+#define CORSTONE1000_DEVICE_SIZE (0x26000000) -+#define CORSTONE1000_MAP_DEVICE MAP_REGION_FLAT( \ -+ CORSTONE1000_DEVICE_BASE, \ -+ CORSTONE1000_DEVICE_SIZE, \ - MT_DEVICE | MT_RW | MT_SECURE) - - #define ARM_IRQ_SEC_PHY_TIMER 29 -@@ -406,9 +406,9 @@ - */ - #define PLAT_ARM_G1S_IRQ_PROPS(grp) \ - ARM_G1S_IRQ_PROPS(grp), \ -- INTR_PROP_DESC(DIPHDA_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, \ -+ INTR_PROP_DESC(CORSTONE1000_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, \ - (grp), GIC_INTR_CFG_LEVEL), \ -- INTR_PROP_DESC(DIPHDA_IRQ_SEC_SYS_TIMER, \ -+ INTR_PROP_DESC(CORSTONE1000_IRQ_SEC_SYS_TIMER, \ - GIC_HIGHEST_SEC_PRIORITY, (grp), GIC_INTR_CFG_LEVEL) - - #define PLAT_ARM_G0_IRQ_PROPS(grp) ARM_G0_IRQ_PROPS(grp) -diff --git a/plat/arm/board/diphda/include/plat_macros.S b/plat/arm/board/corstone1000/include/plat_macros.S -similarity index 100% -rename from plat/arm/board/diphda/include/plat_macros.S -rename to plat/arm/board/corstone1000/include/plat_macros.S -diff --git a/plat/arm/board/corstone1000/platform.mk b/plat/arm/board/corstone1000/platform.mk -new file mode 100644 -index 0000000000..93e2ea0826 ---- /dev/null -+++ b/plat/arm/board/corstone1000/platform.mk -@@ -0,0 +1,83 @@ -+# -+# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. -+# -+# SPDX-License-Identifier: BSD-3-Clause -+# -+ -+# Making sure the corstone1000 platform type is specified -+ifeq ($(filter ${TARGET_PLATFORM}, fpga fvp),) -+ $(error TARGET_PLATFORM must be fpga or fvp) -+endif -+ -+CORSTONE1000_CPU_LIBS +=lib/cpus/aarch64/cortex_a35.S -+ -+PLAT_INCLUDES := -Iplat/arm/board/corstone1000/common/include \ -+ -Iplat/arm/board/corstone1000/include \ -+ -Iinclude/plat/arm/common \ -+ -Iinclude/plat/arm/css/common/aarch64 -+ -+ -+CORSTONE1000_FW_NVCTR_VAL := 255 -+TFW_NVCTR_VAL := ${CORSTONE1000_FW_NVCTR_VAL} -+NTFW_NVCTR_VAL := ${CORSTONE1000_FW_NVCTR_VAL} -+ -+override NEED_BL1 := no -+ -+override NEED_BL2 := yes -+FIP_BL2_ARGS := tb-fw -+ -+override NEED_BL2U := no -+override NEED_BL31 := yes -+NEED_BL32 := yes -+override NEED_BL33 := yes -+ -+# Include GICv2 driver files -+include drivers/arm/gic/v2/gicv2.mk -+ -+CORSTONE1000_GIC_SOURCES := ${GICV2_SOURCES} \ -+ plat/common/plat_gicv2.c \ -+ plat/arm/common/arm_gicv2.c -+ -+ -+BL2_SOURCES += plat/arm/board/corstone1000/common/corstone1000_security.c \ -+ plat/arm/board/corstone1000/common/corstone1000_err.c \ -+ plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c \ -+ lib/utils/mem_region.c \ -+ plat/arm/board/corstone1000/common/corstone1000_helpers.S \ -+ plat/arm/board/corstone1000/common/corstone1000_plat.c \ -+ plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c \ -+ ${CORSTONE1000_CPU_LIBS} \ -+ -+ -+BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \ -+ lib/utils/mem_region.c \ -+ plat/arm/board/corstone1000/common/corstone1000_helpers.S \ -+ plat/arm/board/corstone1000/common/corstone1000_topology.c \ -+ plat/arm/board/corstone1000/common/corstone1000_security.c \ -+ plat/arm/board/corstone1000/common/corstone1000_plat.c \ -+ plat/arm/board/corstone1000/common/corstone1000_pm.c \ -+ ${CORSTONE1000_CPU_LIBS} \ -+ ${CORSTONE1000_GIC_SOURCES} -+ -+ifneq (${ENABLE_STACK_PROTECTOR},0) -+ ifneq (${ENABLE_STACK_PROTECTOR},none) -+ CORSTONE1000_SECURITY_SOURCES := plat/arm/board/corstone1000/common/corstone1000_stack_protector.c -+ BL2_SOURCES += ${CORSTONE1000_SECURITY_SOURCES} -+ BL31_SOURCES += ${CORSTONE1000_SECURITY_SOURCES} -+ endif -+endif -+ -+FDT_SOURCES += plat/arm/board/corstone1000/common/fdts/corstone1000_spmc_manifest.dts -+CORSTONE1000_TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/corstone1000_spmc_manifest.dtb -+ -+# Add the SPMC manifest to FIP and specify the same to certtool -+$(eval $(call TOOL_ADD_PAYLOAD,${CORSTONE1000_TOS_FW_CONFIG},--tos-fw-config,${CORSTONE1000_TOS_FW_CONFIG})) -+ -+# Adding TARGET_PLATFORM as a GCC define (-D option) -+$(eval $(call add_define,TARGET_PLATFORM_$(call uppercase,${TARGET_PLATFORM}))) -+ -+# Adding CORSTONE1000_FW_NVCTR_VAL as a GCC define (-D option) -+$(eval $(call add_define,CORSTONE1000_FW_NVCTR_VAL)) -+ -+include plat/arm/common/arm_common.mk -+include plat/arm/board/common/board_common.mk -diff --git a/plat/arm/board/diphda/platform.mk b/plat/arm/board/diphda/platform.mk -deleted file mode 100644 -index 8b89cee7ed..0000000000 ---- a/plat/arm/board/diphda/platform.mk -+++ /dev/null -@@ -1,83 +0,0 @@ --# --# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. --# --# SPDX-License-Identifier: BSD-3-Clause --# -- --# Making sure the diphda platform type is specified --ifeq ($(filter ${TARGET_PLATFORM}, fpga fvp),) -- $(error TARGET_PLATFORM must be fpga or fvp) --endif -- --DIPHDA_CPU_LIBS +=lib/cpus/aarch64/cortex_a35.S -- --PLAT_INCLUDES := -Iplat/arm/board/diphda/common/include \ -- -Iplat/arm/board/diphda/include \ -- -Iinclude/plat/arm/common \ -- -Iinclude/plat/arm/css/common/aarch64 -- -- --DIPHDA_FW_NVCTR_VAL := 255 --TFW_NVCTR_VAL := ${DIPHDA_FW_NVCTR_VAL} --NTFW_NVCTR_VAL := ${DIPHDA_FW_NVCTR_VAL} -- --override NEED_BL1 := no -- --override NEED_BL2 := yes --FIP_BL2_ARGS := tb-fw -- --override NEED_BL2U := no --override NEED_BL31 := yes --NEED_BL32 := yes --override NEED_BL33 := yes -- --# Include GICv2 driver files --include drivers/arm/gic/v2/gicv2.mk -- --DIPHDA_GIC_SOURCES := ${GICV2_SOURCES} \ -- plat/common/plat_gicv2.c \ -- plat/arm/common/arm_gicv2.c -- -- --BL2_SOURCES += plat/arm/board/diphda/common/diphda_security.c \ -- plat/arm/board/diphda/common/diphda_err.c \ -- plat/arm/board/diphda/common/diphda_trusted_boot.c \ -- lib/utils/mem_region.c \ -- plat/arm/board/diphda/common/diphda_helpers.S \ -- plat/arm/board/diphda/common/diphda_plat.c \ -- plat/arm/board/diphda/common/diphda_bl2_mem_params_desc.c \ -- ${DIPHDA_CPU_LIBS} \ -- -- --BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \ -- lib/utils/mem_region.c \ -- plat/arm/board/diphda/common/diphda_helpers.S \ -- plat/arm/board/diphda/common/diphda_topology.c \ -- plat/arm/board/diphda/common/diphda_security.c \ -- plat/arm/board/diphda/common/diphda_plat.c \ -- plat/arm/board/diphda/common/diphda_pm.c \ -- ${DIPHDA_CPU_LIBS} \ -- ${DIPHDA_GIC_SOURCES} -- --ifneq (${ENABLE_STACK_PROTECTOR},0) -- ifneq (${ENABLE_STACK_PROTECTOR},none) -- DIPHDA_SECURITY_SOURCES := plat/arm/board/diphda/common/diphda_stack_protector.c -- BL2_SOURCES += ${DIPHDA_SECURITY_SOURCES} -- BL31_SOURCES += ${DIPHDA_SECURITY_SOURCES} -- endif --endif -- --FDT_SOURCES += plat/arm/board/diphda/common/fdts/diphda_spmc_manifest.dts --DIPHDA_TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/diphda_spmc_manifest.dtb -- --# Add the SPMC manifest to FIP and specify the same to certtool --$(eval $(call TOOL_ADD_PAYLOAD,${DIPHDA_TOS_FW_CONFIG},--tos-fw-config,${DIPHDA_TOS_FW_CONFIG})) -- --# Adding TARGET_PLATFORM as a GCC define (-D option) --$(eval $(call add_define,TARGET_PLATFORM_$(call uppercase,${TARGET_PLATFORM}))) -- --# Adding DIPHDA_FW_NVCTR_VAL as a GCC define (-D option) --$(eval $(call add_define,DIPHDA_FW_NVCTR_VAL)) -- --include plat/arm/common/arm_common.mk --include plat/arm/board/common/board_common.mk --- -2.33.0 -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-plat-arm-corstone1000-made-changes-to-accommodate-3M.patch deleted +0 -201
201 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-corstone1000-implement-platform-specific-psci-reset.patch deleted +0 -60
60 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0004-plat-arm-corstone1000-change-base-address-of-FIP-in-the-fl.patch deleted +0 -33
@@ -1,33 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Satish Kumar <[email protected]> - -From 5541d466ebf46f0a14fae3effbcc46bcc2dd8efc Mon Sep 17 00:00:00 2001 -From: Satish Kumar <[email protected]> -Date: Mon, 20 Sep 2021 06:01:54 +0100 -Subject: [PATCH 1/1] plat/arm: corstone1000: change base address of FIP in the flash - -More space in the flash is reserved up front for metadata -parser and UEFI variables. That requires change in the flash -base address of where images are present. - -Signed-off-by: Satish Kumar <[email protected]> ---- - plat/arm/board/corstone1000/common/include/platform_def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/arm/board/corstone1000/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h -index 97d7b2974..079b1c9d4 100644 ---- a/plat/arm/board/corstone1000/common/include/platform_def.h -+++ b/plat/arm/board/corstone1000/common/include/platform_def.h -@@ -208,7 +208,7 @@ - - /* NOR Flash */ - --#define PLAT_ARM_FIP_BASE UL(0x08131000) -+#define PLAT_ARM_FIP_BASE UL(0x081EF000) - #define PLAT_ARM_FIP_MAX_SIZE UL(0x1ff000) /* 1.996 MB */ - - #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE --- -2.17.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0005-plat-arm-corstone1000-identify-which-bank-to-load-fip-from.patch deleted +0 -102
102 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/2 arm-bsp/trusted-firmware-m: corstone1000: remove unused patches
commit ab339b24d49736d01aff562e30d28e387b823755 removed the reference to these patches but did not remove them. Removing now to clean-up the tree.
--- ...000-disable-secure-debug-temporarily.patch | 33 - ...ovision-firmware-update-metadata-fwu.patch | 470 ------------- ...rse-the-uefi-firmware-update-capsule.patch | 243 ------- ...-firmware-update-fwu-agent-into-TF-M.patch | 106 --- ...lement-corstone1000_fwu_flash_images.patch | 437 ------------ ...ne1000-add-logic-to-select-boot-bank.patch | 266 -------- ...rstone1000-integrate-watchdog-driver.patch | 645 ------------------ ...one1000-impelment-accept-image-logic.patch | 119 ---- ...implement-select-previous-bank-logic.patch | 91 --- ...-implement-corstone1000_fwu_host_ack.patch | 136 ---- ...e-initailize-multi-core-communicatio.patch | 39 -- ...plement-timer-to-track-host-progress.patch | 169 ----- ...fwu-nv-counter-anti-rollback-support.patch | 369 ---------- ...stone1000-bug-fix-in-openamp-version.patch | 50 -- ...cure-host-watchdog-interrupt-handler.patch | 80 --- 15 files changed, 3253 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-corstone1000-disable-secure-debug-temporarily.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-corstone1000-provision-firmware-update-metadata-fwu.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-corstone1000-parse-the-uefi-firmware-update-capsule.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-corstone1000-add-firmware-update-fwu-agent-into-TF-M.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0005-corstone1000-implement-corstone1000_fwu_flash_images.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0006-corstone1000-add-logic-to-select-boot-bank.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0007-corstone1000-integrate-watchdog-driver.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-corstone1000-impelment-accept-image-logic.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-corstone1000-implement-select-previous-bank-logic.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0010-corstone1000-implement-corstone1000_fwu_host_ack.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0011-SPM-multiple-core-initailize-multi-core-communicatio.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0012-corstone1000-implement-timer-to-track-host-progress.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0013-corstone1000-fwu-nv-counter-anti-rollback-support.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0014-corstone1000-bug-fix-in-openamp-version.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0015-corstone1000-secure-host-watchdog-interrupt-handler.patch
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0001-corstone1000-disable-secure-debug-temporarily.patch deleted +0 -33
@@ -1,33 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Satish Kumar <[email protected]> - -From beb8a8d92537b9574717f0a9a914642c15b439b1 Mon Sep 17 00:00:00 2001 -From: Satish Kumar <[email protected]> -Date: Wed, 29 Sep 2021 04:58:59 +0100 -Subject: [PATCH 01/15] corstone1000: disable secure debug temporarily - -Until ARM-DS is ready to use psa-adac secure debug protocol, -disable the secure debug in the platform. At present, the -secure debug integration is tested with the PyOCD based -scripts. - -Change-Id: I3dd0f20e5714a2db69425607d9404172ce52129e -Signed-off-by: Satish Kumar <[email protected]> ---- - platform/ext/target/arm/corstone1000/config.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/platform/ext/target/arm/corstone1000/config.cmake b/platform/ext/target/arm/corstone1000/config.cmake -index dc12d27f9c..203e6b79a6 100644 ---- a/platform/ext/target/arm/corstone1000/config.cmake -+++ b/platform/ext/target/arm/corstone1000/config.cmake -@@ -37,5 +37,5 @@ set(OPENAMP_VERSION "33037b04e0732e58fc0fa36afc244999ef632e1 - if (${PLATFORM_IS_FVP}) - set(PLATFORM_PSA_ADAC_SECURE_DEBUG FALSE CACHE BOOL "Whether to use psa-adac secure debug.") - else() -- set(PLATFORM_PSA_ADAC_SECURE_DEBUG TRUE CACHE BOOL "Whether to use psa-adac secure debug.") -+ set(PLATFORM_PSA_ADAC_SECURE_DEBUG FALSE CACHE BOOL "Whether to use psa-adac secure debug.") - endif() --- -2.17.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0002-corstone1000-provision-firmware-update-metadata-fwu.patch deleted +0 -470
470 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0003-corstone1000-parse-the-uefi-firmware-update-capsule.patch deleted +0 -243
243 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0004-corstone1000-add-firmware-update-fwu-agent-into-TF-M.patch deleted +0 -106
106 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0005-corstone1000-implement-corstone1000_fwu_flash_images.patch deleted +0 -437
437 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0006-corstone1000-add-logic-to-select-boot-bank.patch deleted +0 -266
266 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0007-corstone1000-integrate-watchdog-driver.patch deleted +0 -645
645 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0008-corstone1000-impelment-accept-image-logic.patch deleted +0 -119
119 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0009-corstone1000-implement-select-previous-bank-logic.patch deleted +0 -91
91 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0010-corstone1000-implement-corstone1000_fwu_host_ack.patch deleted +0 -136
136 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0011-SPM-multiple-core-initailize-multi-core-communicatio.patch deleted +0 -39
@@ -1,39 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Satish Kumar <[email protected]> - -From 35ab33099d7b091630ec677cbad57abd60105f91 Mon Sep 17 00:00:00 2001 -From: Satish Kumar <[email protected]> -Date: Sun, 14 Nov 2021 11:49:11 +0000 -Subject: [PATCH 11/15] SPM: multiple core: initailize multi-core communication - before the non-secure core is out of rest - -Tf-m should be ready to receive the communication before non-secure -has been taken out of rest. - -Signed-off-by: Satish Kumar <[email protected]> -Change-Id: I0b609fffbed0fc2f09b521389fd50f4e992ad00d ---- - secure_fw/spm/cmsis_psa/tfm_multi_core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/secure_fw/spm/cmsis_psa/tfm_multi_core.c b/secure_fw/spm/cmsis_psa/tfm_multi_core.c -index f830a6f5f7..946d1a60eb 100644 ---- a/secure_fw/spm/cmsis_psa/tfm_multi_core.c -+++ b/secure_fw/spm/cmsis_psa/tfm_multi_core.c -@@ -25,11 +25,11 @@ void tfm_nspm_thread_entry(void) - SPMLOG_DBGMSG("Enabling non-secure core..."); - #endif - -+ tfm_inter_core_comm_init(); -+ - tfm_hal_boot_ns_cpu(tfm_spm_hal_get_ns_VTOR()); - tfm_hal_wait_for_ns_cpu_ready(); - -- tfm_inter_core_comm_init(); -- - /* - * TODO - * The infinite-loop can be replaced with platform-specific low-power sleep --- -2.17.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0012-corstone1000-implement-timer-to-track-host-progress.patch deleted +0 -169
169 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0013-corstone1000-fwu-nv-counter-anti-rollback-support.patch deleted +0 -369
246 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0014-corstone1000-bug-fix-in-openamp-version.patch deleted +0 -50
50 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0015-corstone1000-secure-host-watchdog-interrupt-handler.patch deleted +0 -80
80 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
Jon Mason
AppliedQuoted 2 lines · Jon Mason
commit
24db3b56ba1285e4196da9416a8914c5bcaf8fd4removed references to the patches, but did not remove the patches.
Applied, thanks!
[1/2] arm-bsp/trusted-firmware-a: corstone1000: remove unused patch files
commit: 25e08f2671642c08ce1f7ca731c4f5b85d95429a
[2/2] arm-bsp/trusted-firmware-m: corstone1000: remove unused patches
commit: 2627002c85dee658ebb6a293496a72a927ad1f77Best regards,
Signature · 1 line
Jon Mason <[email protected]>