From 4257c9856e28c567803e7d958e1dec84544ac268 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 6 Apr 2026 11:15:42 -0400 Subject: [PATCH] arm-bsp: remove sgi575 sgi575 has been EOLed, and requires keeping around some recipes because of its removal. Also, the FVP is x86 only, thus limiting CI. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 9 --- ci/fvps.yml | 1 - ci/sgi575.yml | 14 ---- meta-arm-bsp/conf/machine/sgi575.conf | 65 ------------------- .../scp-firmware/scp-firmware-sgi575.inc | 6 -- .../scp-firmware/scp-firmware_%.bbappend | 1 - .../trusted-firmware-a-sgi575.inc | 26 -------- .../trusted-firmware-a_%.bbappend | 1 - .../recipes-bsp/uefi/edk2-firmware-sgi575.inc | 7 -- .../recipes-bsp/uefi/edk2-firmware_%.bbappend | 1 - .../linux/linux-arm-platforms.inc | 9 --- 11 files changed, 140 deletions(-) delete mode 100644 ci/sgi575.yml delete mode 100644 meta-arm-bsp/conf/machine/sgi575.conf delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09a5423f..2aff8b9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -344,14 +344,5 @@ selftest: - KASFILES=./ci/qemuarm64.yml:./ci/selftest.yml:lockfile.yml - kas shell --update --force-checkout $KASFILES -c 'oe-selftest --num-processes 2 --select-tag meta-arm --run-all-tests' -sgi575: - extends: .build - parallel: - matrix: - - TESTING: testimage - # FVP binary is x86-only - tags: - - x86_64 - toolchains: extends: .build diff --git a/ci/fvps.yml b/ci/fvps.yml index 5370402c..39b18d85 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -40,7 +40,6 @@ target: - nativesdk-fvp-rdn2 # These are x86 only... :( - nativesdk-fvp-rdv1 - - nativesdk-fvp-sgi575 # IoT FVPs - fvp-corstone1000 diff --git a/ci/sgi575.yml b/ci/sgi575.yml deleted file mode 100644 index d6e33894..00000000 --- a/ci/sgi575.yml +++ /dev/null @@ -1,14 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json - -header: - version: 14 - includes: - - ci/base.yml - - ci/fvp.yml - -local_conf_header: - sshpregen: | - # Allow the use of the pregen keys as this is CI so safe - COMPATIBLE_MACHINE:pn-ssh-pregen-hostkeys:sgi575 = "sgi575" - -machine: sgi575 diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf deleted file mode 100644 index 6217ecc2..00000000 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ /dev/null @@ -1,65 +0,0 @@ -# Configuration for Arm SGI575 development board - -#@TYPE: Machine -#@NAME: SGI575 -#@DESCRIPTION: Machine configuration for SGI575 - -require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc - -EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" -EXTRA_IMAGEDEPENDS += "trusted-firmware-a" - -# 2.13.0 removes support for sgi575 -PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" - -KERNEL_IMAGETYPE ?= "Image" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -SERIAL_CONSOLES = "115200;ttyAMA0" - -EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" -MACHINE_FEATURES += "efi" - -IMAGE_FSTYPES += "cpio.gz wic" -IMAGE_NAME_SUFFIX = "" -IMAGE_CLASSES += "fvpboot" - -WKS_FILE ?= "efi-disk.wks.in" -WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" - -# testimage config -TEST_TARGET = "OEFVPTarget" -#TEST_TARGET_IP = "127.0.0.1:222" -TEST_SUITES = "fvp_boot" - -# FVP Config -FVP_PROVIDER ?= "fvp-sgi575-native" -FVP_EXE ?= "FVP_CSS_SGI-575" - -# Virtio-Net configuration -FVP_CONFIG[board.virtio_net.enabled] ?= "1" -FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "1" -FVP_CONFIG[board.virtio_net.hostbridge.userNetPorts] = "2222=22" -FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic" - -#FVP_CONFIG[cache_state_modelled] ?= "0" -FVP_CONFIG[css.cmn600.mesh_config_file] = "SGI-575_cmn600.yml" -FVP_CONFIG[css.cmn600.force_rnsam_internal] ?= "false" -FVP_CONFIG[css.gic_distributor.ITS-device-bits] ?= "20" - -FVP_DATA ?= "css.scp.armcortexm7ct=scp-firmware/scp_ramfw.bin@0x0BD80000" -FVP_CONFIG[css.mcp.ROMloader.fname] ?= "scp-firmware/mcp_romfw.bin" -FVP_CONFIG[css.scp.ROMloader.fname] ?= "scp-firmware/scp_romfw.bin" -FVP_CONFIG[css.trustedBootROMloader.fname] ?= "trusted-firmware-a/bl1.bin" -FVP_CONFIG[board.flashloader0.fname] ?= "trusted-firmware-a/fip.bin" - -FVP_CONSOLES[default] = "terminal_uart_ap" -FVP_TERMINALS[css.scp.terminal_uart_aon] ?= "SCP Console" -FVP_TERMINALS[css.mcp.terminal_uart0] ?= "" -FVP_TERMINALS[css.mcp.terminal_uart1] ?= "" -FVP_TERMINALS[css.terminal_uart_ap] ?= "Console" -FVP_TERMINALS[css.terminal_uart1_ap] ?= "" -FVP_TERMINALS[soc.terminal_s0] ?= "" -FVP_TERMINALS[soc.terminal_s1] ?= "" -FVP_TERMINALS[soc.terminal_mcp] ?= "" -FVP_TERMINALS[board.terminal_0] ?= "" -FVP_TERMINALS[board.terminal_1] ?= "" 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 deleted file mode 100644 index 79a41a06..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc +++ /dev/null @@ -1,6 +0,0 @@ -# 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_%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend index 011090e7..d3801e0c 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend @@ -6,6 +6,5 @@ MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc" MACHINE_SCP_REQUIRE:rdn2 = "scp-firmware-rdn2.inc" MACHINE_SCP_REQUIRE:rdv1 = "scp-firmware-rdv1.inc" MACHINE_SCP_REQUIRE:rdv2 = "scp-firmware-rdv2.inc" -MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc" require ${MACHINE_SCP_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc deleted file mode 100644 index c1f16d54..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc +++ /dev/null @@ -1,26 +0,0 @@ -# SGI575 specific TFA support - -COMPATIBLE_MACHINE = "sgi575" -TFA_PLATFORM = "sgi575" -TFA_BUILD_TARGET = "all fip" -TFA_INSTALL_TARGET = "bl1 fip" -TFA_DEBUG = "1" -TFA_MBEDTLS = "1" -TFA_UBOOT = "0" -TFA_UEFI = "1" - -EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \ - ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem" - -# If GENERATE_COT is set, then tf-a will try to use local poetry install -# to run the python cot-dt2c command. Disable the local poetry and use -# the provided cot-dt2c. -EXTRA_OEMAKE += "POETRY=''" -DEPENDS += "cot-dt2c-native" - -# When compiling tf-a with clang, multiple errors are being seen in the -# ASM files: -# error: instruction requires: fp-armv8 -# Given that this is platform is EOLed, forcing it to use GCC and not -# reporting upstream -TOOLCHAIN = "gcc" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 6f7a6e85..ab0f82a3 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -8,6 +8,5 @@ MACHINE_TFA_REQUIRE:rdn2 = "trusted-firmware-a-rdn2.inc" MACHINE_TFA_REQUIRE:rdv1 = "trusted-firmware-a-rdv1.inc" MACHINE_TFA_REQUIRE:rdv2 = "trusted-firmware-a-rdv2.inc" MACHINE_TFA_REQUIRE:sbsa-ref = "trusted-firmware-a-sbsa-ref.inc" -MACHINE_TFA_REQUIRE:sgi575 = "trusted-firmware-a-sgi575.inc" require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc deleted file mode 100644 index e26225f8..00000000 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +++ /dev/null @@ -1,7 +0,0 @@ -# SGI575 specific EDK2 configurations -EDK2_BUILD_RELEASE = "0" -EDK2_PLATFORM = "Sgi575" -EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc" -EDK2_BIN_NAME = "BL33_AP_UEFI.fd" - -COMPATIBLE_MACHINE = "sgi575" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend index 7dd87303..830d4116 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -8,6 +8,5 @@ MACHINE_EDK2_REQUIRE:rdn2 = "edk2-firmware-rdn2.inc" MACHINE_EDK2_REQUIRE:rdv1 = "edk2-firmware-rdv1.inc" MACHINE_EDK2_REQUIRE:rdv2 = "edk2-firmware-rdv2.inc" MACHINE_EDK2_REQUIRE:sbsa-ref = "edk2-firmware-sbsa-ref.inc" -MACHINE_EDK2_REQUIRE:sgi575 = "edk2-firmware-sgi575.inc" require ${MACHINE_EDK2_REQUIRE} diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 2f565312..6ee25cd1 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -135,15 +135,6 @@ KBUILD_DEFCONFIG:rdv2 = "defconfig" KCONFIG_MODE:rdv2 = "--alldefconfig" KCONF_BSP_AUDIT_LEVEL:rdv2 = "0" -# -# SGI575 KMACHINE -# -COMPATIBLE_MACHINE:sgi575 = "sgi575" -KBUILD_DEFCONFIG:sgi575 = "defconfig" -KCONFIG_MODE:sgi575 = "--alldefconfig" -# Upstream defconfig often causes warnings but we don't maintain it -KCONF_BSP_AUDIT_LEVEL:sgi575 = "0" - # # sbsa-ref KMACHINE #