arm-bsp/corstone500: add kas, runfvp and wks
cover arm-bsp/corstone500: add kas, runfvp and wks
Now that we have wic_nopt and ci noop for testimage classes, we can add wks and kas/ci configurations for corstone500.
Also add the FVP settings to use the runfvp script and infrastucture and update the documentation to build (with kas), and run (with runfvp)
Cheers,
Rui
Rui Miguel Silva (4):
arm-bsp/corstone500: add image and container file arm-bsp/corstone500: add wks container for image kas/ci: add corstone500 platform arm-bsp/corstone500/docs: update for kas and runfvp
.gitlab-ci.yml | 5 ++ ci/corstone500.yml | 12 +++++ kas/corstone500.yml | 47 +++++++++++++++++++ meta-arm-bsp/conf/machine/corstone500.conf | 22 ++++++++- meta-arm-bsp/documentation/corstone500.md | 28 ++++++----- .../wic/core-image-minimal.corstone500.wks | 12 +++++ 6 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 kas/corstone500.yml create mode 100644 meta-arm-bsp/wic/core-image-minimal.corstone500.wks
Signature · 1 line
2.35.1
PATCH 1/4 arm-bsp/corstone500: add image and container file
Now that we have the wic_nopt class in meta-arm we can add the the wks file to create the final image for this platform.
--- meta-arm-bsp/wic/core-image-minimal.corstone500.wks | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 meta-arm-bsp/wic/core-image-minimal.corstone500.wks
meta-arm-bsp/wic/core-image-minimal.corstone500.wks new file +12 -0
@@ -0,0 +1,12 @@ +# WIC partitioning for corstone500 +# Layout and maximum sizes (to be defined): +# + +# Rawcopy of the FIP binary +part --source rawcopy --sourceparams="file=fip.bin" --no-table --align 1 --fixed-size 1 + +# Rawcopy of the kernel binary +part --source rawcopy --sourceparams="file=zImage" --no-table --fixed-size 12 + +# Rawcopy of the rootfs +part --source rawcopy --sourceparams="file=${IMGDEPLOYDIR}/core-image-minimal-corstone500.squashfs" --no-table
Signature · 1 line
2.35.1
PATCH 2/4 arm-bsp/corstone500: add wks container for image
In reply to Rui Miguel SilvaAdd final wic image that is provider by corstone500-image target. As at it, remove unnecessary specific filesystem types.
--- meta-arm-bsp/conf/machine/corstone500.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
meta-arm-bsp/conf/machine/corstone500.conf +9 -2
@@ -16,12 +16,19 @@ PREFERRED_VERSION_linux-yocto ?= "5.15%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" -SERIAL_CONSOLES = "115200;ttyAMA0" +IMAGE_CLASSES += "wic_nopt" +IMAGE_FEATURES += "debug-tweaks" +IMAGE_FSTYPES:forcevariable = "cpio.gz squashfs wic wic.nopt" -IMAGE_FSTYPES += "tar.bz2 cpio.gz" +SERIAL_CONSOLES = "115200;ttyAMA0" # Corstone-500 u-boot configuration UBOOT_MACHINE = "corstone500_defconfig" UBOOT_IMAGE_ENTRYPOINT = "0x84000000" UBOOT_IMAGE_LOADADDRESS = "0x84000000" PREFERRED_VERSION_u-boot ?= "2022.01" + +# making sure EXTRA_IMAGEDEPENDS will be used while creating the image +WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" + +WKS_FILE ?= "core-image-minimal.corstone500.wks"
Signature · 1 line
2.35.1
PATCH 3/4 kas/ci: add corstone500 platform
In reply to Rui Miguel SilvaAdd kas and ci, including testimage support for corstone500 platform. And for all to work add also the FVP setup.
--- .gitlab-ci.yml | 5 +++ ci/corstone500.yml | 12 ++++++ kas/corstone500.yml | 47 ++++++++++++++++++++++ meta-arm-bsp/conf/machine/corstone500.conf | 11 +++++ 4 files changed, 75 insertions(+) create mode 100644 kas/corstone500.yml
.gitlab-ci.yml +5 -0
@@ -72,6 +72,11 @@ update-repos: corstone500: extends: .build + parallel: + matrix: + - TESTING: testimage + tags: + - x86_64 corstone1000-fvp: extends: .build
ci/corstone500.yml +12 -0
@@ -3,4 +3,16 @@ header: includes: - ci/base.yml +local_conf_header: + testimagefvp: | + INHERIT += "fvpboot" + IMAGE_FEATURES:remove = " ssh-server-dropbear" + perf: | + machine: corstone500 + +distro: poky-tiny + +target: + - core-image-minimal + - perf
kas/corstone500.yml new file +47 -0
47 lines not on this page · raw message
meta-arm-bsp/conf/machine/corstone500.conf +11 -0
@@ -32,3 +32,14 @@ PREFERRED_VERSION_u-boot ?= "2022.01" WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" WKS_FILE ?= "core-image-minimal.corstone500.wks" + +TEST_TARGET = "OEFVPTarget" +TEST_SUITES = "noop" + +FVP_PROVIDER ?= "fvp-corstone500-native" +FVP_EXE ?= "FVP_Corstone-500" +FVP_CONFIG[board.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1.bin" +FVP_DATA ?= "css.cluster.cpu0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic.nopt@0x80000000" +FVP_CONSOLE ?= "terminal_0" +FVP_TERMINALS[css.terminal_0] ?= "console" +FVP_TERMINALS[css.terminal_1] ?= ""
Signature · 1 line
2.35.1
PATCH 4/4 arm-bsp/corstone500/docs: update for kas and runfvp
In reply to Rui Miguel SilvaUpdate corstone500 documentation to reflect the new build infrastructure (kas) and the in tree run of the fvp using the runfvp command.
--- meta-arm-bsp/documentation/corstone500.md | 28 +++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-)
meta-arm-bsp/documentation/corstone500.md +16 -12
@@ -3,22 +3,26 @@ ## Howto Build and Run ### Configuration: -In the local.conf file, MACHINE should be set as follow: -MACHINE ?= "corstone500" -DISTRO ?= "poky-tiny" -Or set environment variables with that values: - -MACHINE "corstone500" -DISTRO "poky-tiny" +Use the kas ### Build: -``bash$ bitbake arm-reference-image``` + +``bash$ kas build kas/corstone500.yml ### Run: -To run the result in a Fixed Virtual Platform please get: -https://git.linaro.org/landing-teams/working/arm/model-scripts -and follow the instructions in the readme.txt file in that -repository. +Building using kas should have fetch the Fixed Virtual Platform for this +platform and installed at: + +build/tmp/sysroots-components/x86_64/fvp-corstone500-native/usr/bin/./FVP_Corstone-500 + +with this in place is possible to launch the FVP using the runfvp inside the +scripts directory: + +cd scripts + +./runfvp ../build/tmp/deploy/images/corstone500/core-image-minimal-corstone500.fvpconf --console + +this will output the console in the launching terminal
Signature · 1 line
2.35.1
Jon Mason
AppliedQuoted 8 lines · Rui Miguel Silva
Now that we have
wic_noptand ci noop for testimage classes, we can add wks and kas/ci configurations for corstone500.Also add the FVP settings to use the runfvp script and infrastucture and update the documentation to build (with kas), and run (with runfvp)
[...]
Applied, thanks!
[1/4] arm-bsp/corstone500: add image and container file
commit: 3e3f989ab5a67c5a9d3a2770c80d27124e1f9250
[2/4] arm-bsp/corstone500: add wks container for image
commit: 7b3ce21458491338fa78cb83a6890d6364a696e4
[3/4] kas/ci: add corstone500 platform
commit: 575d502cc84189ef164d1b6d615bad278467f5d3
[4/4] arm-bsp/corstone500/docs: update for kas and runfvp
commit: d5406cec2ea53aa62008f86bf586948983ed1394Best regards,
Signature · 1 line
Jon Mason <[email protected]>