Skip to content
Snippets Groups Projects
Commit 66eb3040 authored by Robbie Cao's avatar Robbie Cao Committed by Diego Sueiro
Browse files

arm-systemready/acs: Upgrade SystemReady IR ACS to version 2.1.0


In ACS 2.1.0, the acs_results is moved to partition :1. Change the
resultspath to match it.

Also update README to reflect the version change.

Signed-off-by: default avatarRobbie Cao <robbie.cao@arm.com>
Signed-off-by: default avatarDiego Sueiro <diego.sueiro@arm.com>
parent 7acf1b53
Branches
Tags
No related merge requests found
......@@ -55,7 +55,7 @@ directories are missing, or if any file's contents do not pass its file-specific
checks.
The ACS test results which are checked by the script can be viewed in
`${TMPDIR}/work/aarch64-oe-linux/arm-systemready-ir-acs/2.0.0-r0/testimage/`. If
`${TMPDIR}/work/aarch64-oe-linux/arm-systemready-ir-acs/2.1.0-r0/testimage/`. If
the check fails, the bitbake `testimage` task will fail.
......@@ -75,7 +75,7 @@ Arm SystemReady has four bands:
* [Arm SystemReady LS][]
Currently, this layer only supports
[Arm SystemReady IR ACS version v23.03_2.0.0][], which is verified on the
[Arm SystemReady IR ACS version v23.09_2.1.0][], which is verified on the
[`fvp-base`][] machine.
## Build and Run
......@@ -139,7 +139,7 @@ be modified or refactored as necessary.
[Arm SystemReady ES]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/es
[Arm SystemReady IR]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/ir
[Arm SystemReady LS]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/ls
[Arm SystemReady IR ACS version v23.03_2.0.0]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images/v23.03_2.0.0
[Arm SystemReady IR ACS version v23.09_2.1.0]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images/v23.09_2.1.0
[Arm SystemReady scripts]: https://gitlab.arm.com/systemready/systemready-scripts
[EDK2 SCT Results Parser]: https://gitlab.arm.com/systemready/edk2-test-parser
[`arm-systemready-ir-acs.bb`]: recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb
......
......@@ -106,7 +106,7 @@ python acs_logs_handle() {
shutil.copyfile(report_file, report_file_dest)
# Extract the log files from the Wic image to the testimage logs directory
resultspath = deployfile + ':3/acs_results'
resultspath = deployfile + ':1/acs_results'
import subprocess
subprocess.run(['wic', 'cp', resultspath, logdir], check=True)
......
......@@ -45,8 +45,8 @@ COMPATIBLE_MACHINE = "fvp-*"
TEST_SUITES = "arm_systemready_ir_acs"
PV = "2.0.0"
PV_DATE = "23.03"
PV = "2.1.0"
PV_DATE = "23.09"
FULL_PV = "v${PV_DATE}_${PV}"
ARM_SYSTEMREADY_IR_ACS_BRANCH ?= "main"
IMAGE_FILENAME = "ir-acs-live-image-generic-arm64.wic"
......@@ -54,7 +54,7 @@ SRC_URI = " \
https://github.com/ARM-software/arm-systemready/raw/${ARM_SYSTEMREADY_IR_ACS_BRANCH}/IR/prebuilt_images/${FULL_PV}/${IMAGE_FILENAME}.xz;name=acs-img \
git://git.gitlab.arm.com/systemready/systemready-ir-template.git;protocol=https;nobranch=1;destsuffix=systemready-ir-template;name=sr-ir-template \
"
SRC_URI[acs-img.sha256sum] = "ea52f84dab44bde97de3e2d2224d883acaae35724dd8e2bdfb125de49040f9b3"
SRC_URI[acs-img.sha256sum] = "c9bf2abfe06878f4c47af5052a73260239f61860e3bae39345874b4fae6b3843"
# Revision pointing to v2023.04 tag
SRCREV_sr-ir-template = "c714db178ddf72e5ae5017f15421095297d5bf0e"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment