@@ -1,5 +1,6 @@
# SGI575 specific SCP configurations and build instructions
COMPATIBLE_MACHINE:sgi575 = "sgi575"
+SCP_PRODUCT_GROUP = "neoverse-rd"
SCP_LOG_LEVEL = "INFO"
@@ -1,5 +1,6 @@
# TC specific SCP configuration
COMPATIBLE_MACHINE = "(tc1)"
+SCP_PRODUCT_GROUP = "totalcompute"
FW_TARGETS = "scp"
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
@@ -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
}
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%)