From ea797536dadeb0088a8fd57ecf934d776c3b231f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 7 Aug 2023 10:16:17 -0500 Subject: [PATCH] arm-bsp: clean-up patch noise Signed-off-by: Jon Mason --- .../0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch | 1 - .../0001-armv7-adding-generic-timer-access-through-MMIO.patch | 1 - .../0003-HACK-disable-instruction-cache-and-data-cache.patch | 1 - .../optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch | 1 - .../psa-apitest/0001-corstone1000-port-crypto-config.patch | 1 - 5 files changed, 5 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch index 3afaa4b0..d834e95b 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch @@ -16,7 +16,6 @@ image starts at fip partition + fip signature area size. Upstream-Status: Pending Signed-off-by: Mohamed Omar Asaker -%% original patch: 0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch --- bl2/bl2_main.c | 4 +++ .../corstone1000/common/corstone1000_plat.c | 32 ++++++------------- diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone500/0001-armv7-adding-generic-timer-access-through-MMIO.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone500/0001-armv7-adding-generic-timer-access-through-MMIO.patch index 3d8545ff..1d28631a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone500/0001-armv7-adding-generic-timer-access-through-MMIO.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone500/0001-armv7-adding-generic-timer-access-through-MMIO.patch @@ -20,7 +20,6 @@ the u-boot initcall level (timer_init) before u-boot relocation. Signed-off-by: Rui Miguel Silva Signed-off-by: Abdellatif El Khlifi -%% original patch: 0001-armv7-adding-generic-timer-access-through-MMIO.patch Signed-off-by: Rui Miguel Silva --- diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch index e8f4cc44..ebe4d726 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch @@ -12,7 +12,6 @@ and D cache until a proper fix is found. Signed-off-by: Vishnu Banavath -%% original patch: 0003-HACK-disable-instruction-cache-and-data-cache.patch diff --git a/core/arch/arm/kernel/entry_a64.S b/core/arch/arm/kernel/entry_a64.S index 875b6e69..594d6928 100644 diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch index 67d98725..ca4405d8 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch @@ -9,7 +9,6 @@ Subject: [PATCH] Handle logging syscall Signed-off-by: Balint Dobszay Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 -%% original patch: 0004-Handle-logging-syscall.patch diff --git a/core/arch/arm/kernel/spmc_sp_handler.c b/core/arch/arm/kernel/spmc_sp_handler.c index e0fa0aa6..c7a45387 100644 diff --git a/meta-arm-bsp/recipes-security/trusted-services/corstone1000/psa-apitest/0001-corstone1000-port-crypto-config.patch b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/psa-apitest/0001-corstone1000-port-crypto-config.patch index c7289562..072b50b4 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/corstone1000/psa-apitest/0001-corstone1000-port-crypto-config.patch +++ b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/psa-apitest/0001-corstone1000-port-crypto-config.patch @@ -9,7 +9,6 @@ Subject: [PATCH] corstone1000: port crypto config Signed-off-by: Satish Kumar -%% original patch: 0002-corstone1000-port-crypto-config.patch Signed-off-by: Rui Miguel Silva ---