* [PATCH 1/3] arm/scp-firmware: update to v2.14.0
@ 2024-03-21 14:34 Jon Mason
2024-03-21 14:34 ` [PATCH 2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2 Jon Mason
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jon Mason @ 2024-03-21 14:34 UTC (permalink / raw
To: meta-arm
Update to the latest version of SCP. In this release, some of the
platforms were grouped into common family directories, which
necessitated adding a variable to specify which one.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.../recipes-bsp/scp-firmware/scp-firmware-sgi575.inc | 1 +
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc | 1 +
.../{scp-firmware_2.13.0.bb => scp-firmware_2.14.0.bb} | 8 +++-----
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta-arm/recipes-bsp/scp-firmware/{scp-firmware_2.13.0.bb => scp-firmware_2.14.0.bb} (94%)
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
index 3413822a6413..79a41a06f66d 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc
@@ -1,5 +1,6 @@
# SGI575 specific SCP configurations and build instructions
COMPATIBLE_MACHINE:sgi575 = "sgi575"
+SCP_PRODUCT_GROUP = "neoverse-rd"
SCP_LOG_LEVEL = "INFO"
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
index 2c6563573f3a..87160598d5cb 100644
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
+++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc
@@ -1,5 +1,6 @@
# TC specific SCP configuration
COMPATIBLE_MACHINE = "(tc1)"
+SCP_PRODUCT_GROUP = "totalcompute"
FW_TARGETS = "scp"
diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb
similarity index 94%
rename from meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb
rename to meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb
index 18867b03915b..c0e40d903e12 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb
@@ -12,12 +12,13 @@ SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \
"
SRCBRANCH = "main"
-SRCREV = "cc4c9e017348d92054f74026ee1beb081403c168"
+SRCREV = "3267f2964114a56faaf46a40704be6ca78240725"
PROVIDES += "virtual/control-processor-firmware"
CMAKE_BUILD_TYPE ?= "RelWithDebInfo"
SCP_PLATFORM ?= "${MACHINE}"
+SCP_PRODUCT_GROUP ?= "."
SCP_LOG_LEVEL ?= "WARN"
SCP_PLATFORM_FEATURE_SET ?= "0"
@@ -30,9 +31,6 @@ DEPENDS = "gcc-arm-none-eabi-native \
# For now we only build with GCC, so stop meta-clang trying to get involved
TOOLCHAIN = "gcc"
-# remove once arm-none-eabi-gcc updates to 13 or newer like poky
-DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
-
inherit deploy
B = "${WORKDIR}/build"
@@ -61,7 +59,7 @@ do_configure() {
for FW in ${FW_TARGETS}; do
for TYPE in ${FW_INSTALL}; do
bbnote Configuring ${SCP_PLATFORM}/${FW}_${TYPE}...
- cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR:PATH="${SCP_PLATFORM}/${FW}_${TYPE}"
+ cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR:PATH="${SCP_PRODUCT_GROUP}/${SCP_PLATFORM}/${FW}_${TYPE}"
done
done
}
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2
2024-03-21 14:34 [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
@ 2024-03-21 14:34 ` Jon Mason
2024-03-21 14:34 ` [PATCH 3/3] CI: reduce coverage of dev kernel Jon Mason
2024-03-22 0:39 ` [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2024-03-21 14:34 UTC (permalink / raw
To: meta-arm
gcc-arm-none-eabi v11.2 is no longer needed by tf-m. Remove this
version, as there is a newer one available.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
ci/toolchains.yml | 2 --
.../gcc-arm-none-eabi-11.2_11.2-2022.02.bb | 23 -------------------
2 files changed, 25 deletions(-)
delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb
diff --git a/ci/toolchains.yml b/ci/toolchains.yml
index 9b63bf285027..056269b2bdd9 100644
--- a/ci/toolchains.yml
+++ b/ci/toolchains.yml
@@ -16,5 +16,3 @@ target:
- nativesdk-gcc-aarch64-none-elf
- gcc-arm-none-eabi
- nativesdk-gcc-arm-none-eabi
- - gcc-arm-none-eabi-11.2
- - nativesdk-gcc-arm-none-eabi-11.2
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb
deleted file mode 100644
index 7fab1e130c11..000000000000
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require arm-binary-toolchain.inc
-
-COMPATIBLE_HOST = "(x86_64|aarch64).*-linux"
-
-SUMMARY = "Arm GNU Toolchain - AArch32 bare-metal target (arm-none-eabi)"
-LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
-
-LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0"
-LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
-
-BINNAME = "arm-none-eabi"
-
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}"
-SRC_URI[gcc-aarch64.sha256sum] = "ef1d82e5894e3908cb7ed49c5485b5b95deefa32872f79c2b5f6f5447cabf55f"
-SRC_URI[gcc-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"
-
-S = "${WORKDIR}/gcc-arm-${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+"
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] CI: reduce coverage of dev kernel
2024-03-21 14:34 [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
2024-03-21 14:34 ` [PATCH 2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2 Jon Mason
@ 2024-03-21 14:34 ` Jon Mason
2024-03-22 0:39 ` [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2024-03-21 14:34 UTC (permalink / raw
To: meta-arm
To reduce build and test times in CI, move the dev kernel outside the
standard matrix. This results in it still being built and tested for
the platform, but only with gcc/glibc (and not against clang and musl).
This greatly reduces the number of permutations that need to be
verified.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.gitlab-ci.yml | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 120cbe3e9458..d6ac3614701f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -186,56 +186,66 @@ qemu-generic-arm64:
extends: .build
parallel:
matrix:
- - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
+ - KERNEL: [linux-yocto, linux-yocto-rt]
TOOLCHAINS: [gcc, clang]
TESTING: testimage
+ - KERNEL: linux-yocto-dev
+ TESTING: testimage
qemuarm64-secureboot:
extends: .build
parallel:
matrix:
- - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
+ - KERNEL: [linux-yocto, linux-yocto-rt]
TOOLCHAINS: [gcc, clang]
TCLIBC: [glibc, musl]
TS: [none, qemuarm64-secureboot-ts]
TESTING: testimage
+ - KERNEL: linux-yocto-dev
+ TESTING: testimage
qemuarm64:
extends: .build
parallel:
matrix:
- DISTRO: poky
- KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
+ KERNEL: [linux-yocto, linux-yocto-rt]
TOOLCHAINS: [gcc, clang]
FIRMWARE: [u-boot, edk2]
TESTING: testimage
- DISTRO: poky-tiny
TESTING: testimage
- VIRT: xen
+ - KERNEL: linux-yocto-dev
+ TESTING: testimage
qemuarm-secureboot:
extends: .build
parallel:
matrix:
- - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
+ - KERNEL: [linux-yocto, linux-yocto-rt]
TOOLCHAINS: [gcc, clang]
TCLIBC: [glibc, musl]
TESTING: testimage
- TOOLCHAINS: external-gccarm
TESTING: testimage
+ - KERNEL: linux-yocto-dev
+ TESTING: testimage
qemuarm:
extends: .build
parallel:
matrix:
- DISTRO: poky
- KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
+ KERNEL: [linux-yocto, linux-yocto-rt]
TOOLCHAINS: [gcc, clang]
FIRMWARE: [u-boot, edk2]
TESTING: testimage
- DISTRO: poky-tiny
TESTING: testimage
- VIRT: xen
+ - KERNEL: linux-yocto-dev
+ TESTING: testimage
qemuarmv5:
extends: .build
--
2.39.3 (Apple Git-146)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] arm/scp-firmware: update to v2.14.0
2024-03-21 14:34 [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
2024-03-21 14:34 ` [PATCH 2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2 Jon Mason
2024-03-21 14:34 ` [PATCH 3/3] CI: reduce coverage of dev kernel Jon Mason
@ 2024-03-22 0:39 ` Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2024-03-22 0:39 UTC (permalink / raw
To: meta-arm, Jon Mason
On Thu, 21 Mar 2024 10:34:23 -0400, Jon Mason wrote:
> Update to the latest version of SCP. In this release, some of the
> platforms were grouped into common family directories, which
> necessitated adding a variable to specify which one.
>
>
Applied, thanks!
[1/3] arm/scp-firmware: update to v2.14.0
commit: 5705ede03d71bb65f62c6c9c5be3378f154d19d9
[2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2
commit: 81e3864bee2ee7212baf239d0a6f5e09698a6438
[3/3] CI: reduce coverage of dev kernel
commit: 0aeec5472ced93b403356d310ec78d572199cf0b
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-22 0:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-21 14:34 [PATCH 1/3] arm/scp-firmware: update to v2.14.0 Jon Mason
2024-03-21 14:34 ` [PATCH 2/3] arm-toolchain/gcc-arm-none-eabi: remove 11.2 Jon Mason
2024-03-21 14:34 ` [PATCH 3/3] CI: reduce coverage of dev kernel Jon Mason
2024-03-22 0:39 ` [PATCH 1/3] arm/scp-firmware: update to v2.14.0 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.