From 170b7e2a1c264c2f6360b4e298b16542196601af Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 10 Aug 2026 13:48:17 -0400 Subject: [PATCH] arm/fvps: change COMPATIBLE_HOST default Make the COMPATIBLE_HOST in fvp-common.inc be both x86 and arm64, since that is the large majority of the FVPs available. Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-common.inc | 2 +- meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-rdn2.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-rdv2.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb | 2 -- meta-arm/recipes-devtools/fvp/fvp-tc3.bb | 2 ++ 9 files changed, 3 insertions(+), 15 deletions(-) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb index 26557769..59c1ead9 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.32.19.bb @@ -21,8 +21,6 @@ UPSTREAM_VERSION_UNKNOWN = "1" MODEL_CODE = "FVP_Base_RevC_AEMvA" SHELL_SCRIPT_NAME = "${MODEL_CODE}_11.32_19_${FVP_ARCH}.sh" -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" - INSANE_SKIP:${PN} += "dev-so" do_install() { diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc index 7f7d4ef5..7021036f 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-common.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc @@ -15,7 +15,7 @@ Please refer to 'https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula'\ ${@bb.utils.contains('BB_ENV_PASSTHROUGH_ADDITIONS', 'ARM_FVP_EULA_ACCEPT', ' and export ARM_FVP_EULA_ACCEPT to 1', '', d)}.\ " -COMPATIBLE_HOST = "x86_64.*-linux" +COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" # The architecture-specific download filename suffix FVP_ARCH:aarch64 = "Linux64_armv8l" diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb index 1c2e4933..37f44eb2 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb @@ -40,6 +40,4 @@ do_install() { done } -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" - INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb index b4288275..9618bf75 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb @@ -18,5 +18,3 @@ LIC_FILES_CHKSUM = "\ file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211 \ " - -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" diff --git a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb index e305afae..c9a1c529 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb @@ -13,5 +13,3 @@ UPSTREAM_VERSION_UNKNOWN = "1" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=92ea58bb219213dfdc48111b693019b6" - -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb b/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb index 73848bfb..17330974 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-rdn2.bb @@ -14,7 +14,5 @@ UPSTREAM_VERSION_UNKNOWN = "1" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=b9005e55057311e41efe02ccfea8ea72" -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" - require remove-execstack.inc REMOVE_EXECSTACKS:x86-64 = "${FVPDIR}/models/${FVP_ARCH_DIR}*/libarmctmodel.so" diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb b/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb index 3da7075a..3ac06880 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-rdv2.bb @@ -14,7 +14,5 @@ UPSTREAM_VERSION_UNKNOWN = "1" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=b9005e55057311e41efe02ccfea8ea72" -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" - require remove-execstack.inc REMOVE_EXECSTACKS:x86-64 = "${FVPDIR}/models/${FVP_ARCH_DIR}*/libarmctmodel.so" diff --git a/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb b/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb index e54f3190..a7e03e35 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-rdv3-r1.bb @@ -13,5 +13,3 @@ UPSTREAM_VERSION_UNKNOWN = "1" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=41f1533ebfbd4f1d32cfc82b55f6729a" - -COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb index 2b0f257d..1f91d441 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb @@ -12,3 +12,5 @@ UPSTREAM_VERSION_UNKNOWN = "1" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ file://license_terms/third_party_licenses/third_party_licenses.txt;md5=58b552b918d097a8ba802168312d76b2" + +COMPATIBLE_HOST = "x86_64.*-linux"