* [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch
@ 2024-03-22 18:55 Jon Mason
2024-03-22 18:56 ` [PATCH 2/2] arm-toolchain: correct UPSTREAM_CHECK Jon Mason
2024-03-23 13:51 ` [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
0 siblings, 2 replies; 3+ messages in thread
From: Jon Mason @ 2024-03-22 18:55 UTC (permalink / raw
To: meta-arm
A patch was not removed when sbsa-acs was updated. Remove and everyone
is now happy.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
...x-for-mismatch-in-function-prototype.patch | 31 -------------------
1 file changed, 31 deletions(-)
delete mode 100644 meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch
deleted file mode 100644
index 0babf2fc01bb..000000000000
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 42cc39fdea21177e82b6cec138c06726242673f7 Mon Sep 17 00:00:00 2001
-From: Srikar Josyula <srikar.josyula@arm.com>
-Date: Tue, 25 Jul 2023 12:55:04 +0530
-Subject: [PATCH] Fix for mismatch in function prototype
-
- - Mismatch between function prototype and definition
- causing build failure with GCC 13.1.1
- - Fixed the function prototype for val_get_exerciser_err_info
-
-Signed-off-by: Srikar Josyula <srikar.josyula@arm.com>
-
-Upstream-Status: Backport
-Signed-off-by: Jon Mason <jon.mason@arm.com>
-
----
- val/include/sbsa_avs_exerciser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/val/include/sbsa_avs_exerciser.h b/val/include/sbsa_avs_exerciser.h
-index 4b2c62b089f5..7c0e3d0fb58f 100644
---- a/val/include/sbsa_avs_exerciser.h
-+++ b/val/include/sbsa_avs_exerciser.h
-@@ -118,7 +118,7 @@ uint32_t val_exerciser_ops(EXERCISER_OPS ops, uint64_t param, uint32_t instance)
- uint32_t val_exerciser_get_data(EXERCISER_DATA_TYPE type, exerciser_data_t *data, uint32_t instance);
- uint32_t val_exerciser_execute_tests(uint32_t level);
- uint32_t val_exerciser_get_bdf(uint32_t instance);
--uint32_t val_get_exerciser_err_info(uint32_t type);
-+uint32_t val_get_exerciser_err_info(EXERCISER_ERROR_CODE type);
-
- uint32_t e001_entry(void);
- uint32_t e002_entry(void);
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm-toolchain: correct UPSTREAM_CHECK
2024-03-22 18:55 [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
@ 2024-03-22 18:56 ` Jon Mason
2024-03-23 13:51 ` [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2024-03-22 18:56 UTC (permalink / raw
To: meta-arm
When the URL and names of the toolchain tarballs changed, the
UPSTREAM_CHECKs were not modified with the proper values. This causes
the tooling to not show when new versions are available. Modify to get
it working again.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.../external-arm-toolchain/gcc-aarch64-none-elf_13.2.Rel1.bb | 4 ++--
.../external-arm-toolchain/gcc-arm-none-eabi_13.2.Rel1.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_13.2.Rel1.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_13.2.Rel1.bb
index 890efa7d0f5a..6262e76caed9 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_13.2.Rel1.bb
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_13.2.Rel1.bb
@@ -17,5 +17,5 @@ SRC_URI[gcc-x86_64.sha256sum] = "7fe7b8548258f079d6ce9be9144d2a10bd2bf93b551dafb
S = "${WORKDIR}/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads"
-UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
+UPSTREAM_CHECK_URI = "https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads"
+UPSTREAM_CHECK_REGEX = "arm-gnu-toolchain-(?P<pver>\d+\.\d*\.[A-z]*\d*).*-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_13.2.Rel1.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_13.2.Rel1.bb
index 00390b587574..6569911df312 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_13.2.Rel1.bb
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_13.2.Rel1.bb
@@ -17,5 +17,5 @@ SRC_URI[gcc-x86_64.sha256sum] = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae
S = "${WORKDIR}/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"
+UPSTREAM_CHECK_URI = "https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads"
+UPSTREAM_CHECK_REGEX = "arm-gnu-toolchain-(?P<pver>\d+\.\d*\.[A-z]*\d*).*-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch
2024-03-22 18:55 [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
2024-03-22 18:56 ` [PATCH 2/2] arm-toolchain: correct UPSTREAM_CHECK Jon Mason
@ 2024-03-23 13:51 ` Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2024-03-23 13:51 UTC (permalink / raw
To: meta-arm, Jon Mason
On Fri, 22 Mar 2024 14:55:59 -0400, Jon Mason wrote:
> A patch was not removed when sbsa-acs was updated. Remove and everyone
> is now happy.
>
>
Applied, thanks!
[1/2] arm/sbsa-acs: remove unreferenced patch
commit: d36afba0cad112540aeec65a71cd94b6c0704328
[2/2] arm-toolchain: correct UPSTREAM_CHECK
commit: f9bc290fc96f78fb415eddf6525d9c5757923264
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-23 13:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-22 18:55 [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
2024-03-22 18:56 ` [PATCH 2/2] arm-toolchain: correct UPSTREAM_CHECK Jon Mason
2024-03-23 13:51 ` [PATCH 1/2] arm/sbsa-acs: remove unreferenced patch Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.