arm-bsp: remove sgi575
PATCH 1/2 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 <[email protected]>
--- .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
.gitlab-ci.yml +0 -9
@@ -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
ci/fvps.yml +0 -1
@@ -40,7 +40,6 @@ target: - nativesdk-fvp-rdn2 # These are x86 only... :( - nativesdk-fvp-rdv1 - - nativesdk-fvp-sgi575 # IoT FVPs - fvp-corstone1000
ci/sgi575.yml deleted +0 -14
@@ -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
meta-arm-bsp/conf/machine/sgi575.conf deleted +0 -65
65 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc deleted +0 -6
@@ -1,6 +0,0 @@ -# SGI575 specific SCP configurations and build instructions - -COMPATIBLE_MACHINE:sgi575 = "sgi575" -SCP_PRODUCT_GROUP = "neoverse-rd" - -SCP_LOG_LEVEL = "INFO"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +0 -1
@@ -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}
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc deleted +0 -26
@@ -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"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0 -1
@@ -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}
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc deleted +0 -7
@@ -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"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +0 -1
@@ -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}
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0 -9
@@ -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 #
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH 2/2 arm-bsp: remove rdv1
rdv1 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 <[email protected]>
--- .gitlab-ci.yml | 9 --- ci/fvps.yml | 2 - ci/rdv1.yml | 14 ---- meta-arm-bsp/conf/machine/rdv1.conf | 67 ------------------- .../scp-firmware/scp-firmware-rdv1.inc | 7 -- .../scp-firmware/scp-firmware_%.bbappend | 1 - .../trusted-firmware-a-rdv1.inc | 19 ------ .../trusted-firmware-a_%.bbappend | 1 - .../recipes-bsp/uefi/edk2-firmware-rdv1.inc | 7 -- .../recipes-bsp/uefi/edk2-firmware_%.bbappend | 1 - .../linux/linux-arm-platforms.inc | 8 --- 11 files changed, 136 deletions(-) delete mode 100644 ci/rdv1.yml delete mode 100644 meta-arm-bsp/conf/machine/rdv1.conf delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdv1.inc delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv1.inc delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv1.inc
.gitlab-ci.yml +0 -9
@@ -312,15 +312,6 @@ rdn2: matrix: - TESTING: testimage -rdv1: - extends: .build - parallel: - matrix: - - TESTING: testimage - # FVP binary is x86-only - tags: - - x86_64 - rdv2: extends: .build parallel:
ci/fvps.yml +0 -2
@@ -38,8 +38,6 @@ target: - nativesdk-fvp-rdv2 - fvp-rdn2 - nativesdk-fvp-rdn2 - # These are x86 only... :( - - nativesdk-fvp-rdv1 # IoT FVPs - fvp-corstone1000
ci/rdv1.yml deleted +0 -14
@@ -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:rdv1 = "rdv1" - -machine: rdv1
meta-arm-bsp/conf/machine/rdv1.conf deleted +0 -67
67 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdv1.inc deleted +0 -7
@@ -1,7 +0,0 @@ -# RD V1 specific SCP configurations and build instructions - -COMPATIBLE_MACHINE:rdv1 = "rdv1" -SCP_PRODUCT_GROUP = "neoverse-rd" -SCP_PLATFORM = "rdv1" - -SCP_LOG_LEVEL = "INFO"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +0 -1
@@ -4,7 +4,6 @@ MACHINE_SCP_REQUIRE ?= "" 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" require ${MACHINE_SCP_REQUIRE}
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv1.inc deleted +0 -19
@@ -1,19 +0,0 @@ -# RD V1 specific TFA support - -COMPATIBLE_MACHINE = "rdv1" -TFA_PLATFORM = "rdv1" -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"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0 -1
@@ -5,7 +5,6 @@ MACHINE_TFA_REQUIRE:corstone1000 = "trusted-firmware-a-corstone1000.inc" MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp-base.inc" MACHINE_TFA_REQUIRE:juno = "trusted-firmware-a-juno.inc" 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"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv1.inc deleted +0 -7
@@ -1,7 +0,0 @@ -# RD V1 specific EDK2 configurations -EDK2_BUILD_RELEASE = "0" -EDK2_PLATFORM = "RdV1" -EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/RdV1/RdV1.dsc" -EDK2_BIN_NAME = "BL33_AP_UEFI.fd" - -COMPATIBLE_MACHINE = "rdv1"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +0 -1
@@ -5,7 +5,6 @@ MACHINE_EDK2_REQUIRE ?= "" MACHINE_EDK2_REQUIRE:fvp-base = "edk2-firmware-fvp-base.inc" MACHINE_EDK2_REQUIRE:juno = "edk2-firmware-juno.inc" 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"
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0 -8
@@ -119,14 +119,6 @@ KBUILD_DEFCONFIG:rdn2 = "defconfig" KCONFIG_MODE:rdn2 = "--alldefconfig" KCONF_BSP_AUDIT_LEVEL:rdn2 = "0" -# -# RDV1 KMACHINE -# -COMPATIBLE_MACHINE:rdv1 = "rdv1" -KBUILD_DEFCONFIG:rdv1 = "defconfig" -KCONFIG_MODE:rdv1 = "--alldefconfig" -KCONF_BSP_AUDIT_LEVEL:rdv1 = "0" - # # RDV2 KMACHINE #
Signature · 1 line
2.50.1 (Apple Git-155)
Jon Mason
AppliedQuoted 4 lines · Jon Mason
sgi575 has been EOLed, and requires keeping around some recipes because of its removal. Also, the FVP is x86 only, thus limiting CI.
Applied, thanks!
[1/2] arm-bsp: remove sgi575
commit: 4257c9856e28c567803e7d958e1dec84544ac268
[2/2] arm-bsp: remove rdv1
commit: ed7a9378e106056185de24d9500ac17e3132c3f5Best regards,
Signature · 1 line
Jon Mason <[email protected]>