diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aff8b9f..2950e873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/ci/fvps.yml b/ci/fvps.yml index 39b18d85..4859bd0c 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -38,8 +38,6 @@ target: - nativesdk-fvp-rdv2 - fvp-rdn2 - nativesdk-fvp-rdn2 - # These are x86 only... :( - - nativesdk-fvp-rdv1 # IoT FVPs - fvp-corstone1000 diff --git a/ci/rdv1.yml b/ci/rdv1.yml deleted file mode 100644 index 52cc4b32..00000000 --- a/ci/rdv1.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:rdv1 = "rdv1" - -machine: rdv1 diff --git a/meta-arm-bsp/conf/machine/rdv1.conf b/meta-arm-bsp/conf/machine/rdv1.conf deleted file mode 100644 index e3b6ce73..00000000 --- a/meta-arm-bsp/conf/machine/rdv1.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Configuration for Arm Neoverse v1 Reference Design development board - -#@TYPE: Machine -#@NAME: RD V1 -#@DESCRIPTION: Machine configuration for RD V1 - -require conf/machine/include/arm/arch-armv8-4a.inc - -EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" -EXTRA_IMAGEDEPENDS += "trusted-firmware-a" - -# 2.13.0 removes support for rdv1 -PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" - -KERNEL_IMAGETYPE ?= "Image" -PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto" -SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1" - -EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" -MACHINE_FEATURES += "efi" - -IMAGE_FSTYPES:forcevariable = "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:2222" -DEFAULT_TEST_SUITES:append = " fvp_boot fvp_devices" -TEST_FVP_DEVICES ?= "watchdog networking" - -# FVP Config -FVP_PROVIDER ?= "fvp-rdv1-native" -FVP_EXE ?= "FVP_RD_V1" - -FVP_CONFIG[css.cmn_650.force_rnsam_internal] ?= "true" -FVP_DATA ?= "css.scp.armcortexm7ct=scp-firmware/scp_ramfw.bin@0x0BD80000 \ - css.mcp.armcortexm7ct=scp-firmware/mcp_ramfw.bin@0x0BF80000" - -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] ?= "" - -FVP_CONFIG[css.gic_distributor.ITS-device-bits] ?= "20" - -# Virtio 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" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdv1.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdv1.inc deleted file mode 100644 index ccd77f6b..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-rdv1.inc +++ /dev/null @@ -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" 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 d3801e0c..e6849857 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend @@ -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} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv1.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv1.inc deleted file mode 100644 index ccd4362d..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv1.inc +++ /dev/null @@ -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" 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 ab0f82a3..66836882 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 @@ -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" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv1.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv1.inc deleted file mode 100644 index 7301a101..00000000 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv1.inc +++ /dev/null @@ -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" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend index 830d4116..75beda26 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -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" 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 6ee25cd1..53725958 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -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 #