diff --git a/ci/fvps.yml b/ci/fvps.yml index e736c519..1ef3e0fa 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -19,11 +19,13 @@ target: # Target packages to test aarch64 - fvp-base-a-aem - fvp-corstone1000 + - fvp-corstone1000-a320 - fvp-rd1-ae - fvp-v3-r1 # Nativesdk to test x86-64 - nativesdk-fvp-base-a-aem - nativesdk-fvp-corstone1000 + - nativesdk-fvp-corstone1000-a320 - nativesdk-fvp-rd1-ae - nativesdk-fvp-v3-r1 # These are x86 only... :( diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index ecdb4e19..07f29960 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -22,6 +22,7 @@ DEFAULT_TEST_SUITES:append = " fvp_boot fvp_devices" # FVP Config FVP_PROVIDER ?= "fvp-corstone1000-native" +FVP_PROVIDER:cortexa320 ?= "fvp-corstone1000-a320-native" FVP_EXE ?= "FVP_Corstone-1000" FVP_EXE:cortexa320 = "FVP_Corstone-1000-A320" FVP_CONSOLES[default] = "host_terminal_0" diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb new file mode 100644 index 00000000..f3093d71 --- /dev/null +++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000-a320.bb @@ -0,0 +1,24 @@ +require fvp-ecosystem.inc + +MODEL = "Corstone-1000-with-Cortex-A320" +MODEL_CODE = "FVP_Corstone_1000-A320" +PV = "11.30.27" + +FVP_AARCH64_SHA256SUM = "a45898fead5549779153263c3544fa1032c285d532275eb678f58cae3317b01f" +FVP_X86_64_SHA256SUM = "d57b248a1c1bc5a6040605d50af94a5151adc4da26ec9acc456ec86b819ffb76" + +SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Corstone-IoT/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" +SRC_URI[fvp-aarch64.sha256sum] = "${FVP_AARCH64_SHA256SUM}" +SRC_URI[fvp-x86_64.sha256sum] = "${FVP_X86_64_SHA256SUM}" + +# The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto +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=a5ce56e117d0ab63791fbb7c35ec2211 \ +" + +COMPATIBLE_HOST = "(aarch64|x86_64).*-linux" +INSANE_SKIP:${PN} += "staticdev rpaths useless-rpaths" +INSANE_SKIP:nativesdk-${PN} += "staticdev rpaths useless-rpaths" diff --git a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb index 1cf8a457..b4288275 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-corstone1000.bb @@ -1,31 +1,22 @@ require fvp-ecosystem.inc MODEL = "Corstone-1000" -MODEL:cortexa320 = "Corstone-1000-with-Cortex-A320" MODEL_CODE = "FVP_Corstone_1000" -MODEL_CODE:cortexa320 = "FVP_Corstone_1000-A320" PV = "11.23.25" -PV:cortexa320 = "11.30.27" FVP_AARCH64_SHA256SUM = "e299e81d5fa8b3d2afee0850fd03be31c1a1c3fad07f79849c63e46ee5e36acc" -FVP_AARCH64_SHA256SUM:cortexa320 = "a45898fead5549779153263c3544fa1032c285d532275eb678f58cae3317b01f" FVP_X86_64_SHA256SUM = "ec34c9564ccb5b1eb62fc2757673343a353db1d116a7cb1b5f82f9d985d99cdf" -FVP_X86_64_SHA256SUM:cortexa320 = "d57b248a1c1bc5a6040605d50af94a5151adc4da26ec9acc456ec86b819ffb76" SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Corstone-IoT/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" SRC_URI[fvp-aarch64.sha256sum] = "${FVP_AARCH64_SHA256SUM}" SRC_URI[fvp-x86_64.sha256sum] = "${FVP_X86_64_SHA256SUM}" - # The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto UPSTREAM_VERSION_UNKNOWN = "1" -LIC_FILES_CHKSUM_MD5 = "0c32ac6f58ebff83065105042ab98211" -LIC_FILES_CHKSUM_MD5:cortexa320 = "a5ce56e117d0ab63791fbb7c35ec2211" - LIC_FILES_CHKSUM = "\ file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ - file://license_terms/third_party_licenses/third_party_licenses.txt;md5=${LIC_FILES_CHKSUM_MD5} \ + file://license_terms/third_party_licenses/third_party_licenses.txt;md5=0c32ac6f58ebff83065105042ab98211 \ " COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"