diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-08-01 12:31:28 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-08-01 12:31:28 +0200 |
| commit | 9451be826792a6effbdc96407f67d9163afdf1bb (patch) | |
| tree | 08ed4df7db68beac14ab2553dde107ac7e1c056c | |
| parent | 6ceb22f7210c9e02ec4bb0ba10085c011527a394 (diff) | |
imx-atf: drop patch
Drop patch 0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch
which got obsoleted by recent meta-freescale update to 6.1.22-2.0.0.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | recipes-bsp/imx-atf/files/0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch | 46 | ||||
| -rw-r--r-- | recipes-bsp/imx-atf/imx-atf_%.bbappend | 1 |
2 files changed, 0 insertions, 47 deletions
diff --git a/recipes-bsp/imx-atf/files/0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch b/recipes-bsp/imx-atf/files/0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch deleted file mode 100644 index 810914c..0000000 --- a/recipes-bsp/imx-atf/files/0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d1dccc8d9e4ff70a742340eb11ea48ae2b88f035 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Mon, 16 May 2022 17:41:23 +0000 -Subject: [PATCH 2/2] imx8m/hab.c: work around gcc 12.1 false positives - -| plat/imx/imx8m/hab.c: In function 'imx_hab_handler': -| plat/imx/imx8m/hab.c:64:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds] -| 64 | #define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18)) -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - plat/imx/imx8m/hab.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/plat/imx/imx8m/hab.c b/plat/imx/imx8m/hab.c -index 2e5154367..658e14bb4 100644 ---- a/plat/imx/imx8m/hab.c -+++ b/plat/imx/imx8m/hab.c -@@ -89,6 +89,15 @@ int imx_hab_handler(uint32_t smc_fid, u_register_t x1, u_register_t x2, - hab_rvt_failsafe_t *hab_rvt_failsafe; - hab_rvt_check_target_t *hab_rvt_check_target; - -+/* work around gcc 12.1 false positives */ -+/* -+| plat/imx/imx8m/hab.c: In function 'imx_hab_handler': -+| plat/imx/imx8m/hab.c:64:57: error: array subscript 0 is outside array bounds of 'uint32_t[0]' {aka 'unsigned int[]'} [-Werror=array-bounds] -+| 64 | #define HAB_RVT_CHECK_TARGET_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x18)) -+| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+*/ -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Warray-bounds" - switch(x1) { - case IMX_SIP_HAB_AUTHENTICATE: - hab_rvt_authenticate_image = hab_rvt_authenticate_image_p; -@@ -116,6 +125,7 @@ int imx_hab_handler(uint32_t smc_fid, u_register_t x1, u_register_t x2, - return SMC_UNK; - - }; -+#pragma GCC diagnostic pop - - return 0; - } --- -2.37.0 - diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend index 0e88a32..aae09b9 100644 --- a/recipes-bsp/imx-atf/imx-atf_%.bbappend +++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRC_URI:append:tdx = " \ file://0001-Revert-Add-NXP-s-SoCs-partition-reboot-support.patch \ - file://0002-imx8m-hab.c-work-around-gcc-12.1-false-positives.patch \ " EXTRA_OEMAKE:append:tdx = " \ |