From patchwork Fri Apr 1 15:35:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harry.moulton@arm.com X-Patchwork-Id: 6242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87601C4707A for ; Mon, 4 Apr 2022 18:46:41 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.333.1648827340502173769 for ; Fri, 01 Apr 2022 08:35:41 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: harry.moulton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7EF6411FB; Fri, 1 Apr 2022 08:35:39 -0700 (PDT) Received: from e123741.cambridge.arm.com (e123741.cambridge.arm.com [10.1.196.216]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D4DEF3F73B; Fri, 1 Apr 2022 08:35:38 -0700 (PDT) From: harry.moulton@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Harry Moulton Subject: [PATCH] arm-bsp/machine: Add runfvp config for corstone1000 Date: Fri, 1 Apr 2022 16:35:18 +0100 Message-Id: <20220401153518.26749-1-harry.moulton@arm.com> X-Mailer: git-send-email 2.17.1 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Apr 2022 18:46:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3230 From: Harry Moulton Add the runfvp config for corstone1000-fvp. Signed-off-by: Harry Moulton --- .gitlab-ci.yml | 5 +++ ci/corstone1000-fvp.yml | 6 ++++ kas/corstone1000-fvp.yml | 7 ++++ .../conf/machine/corstone1000-fvp.conf | 34 ++++++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21fcd43f..c581f1a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,11 @@ corstone500: corstone1000-fvp: extends: .build + parallel: + matrix: + - TESTING: testimage + tags: + - x86_64 corstone1000-mps3: extends: .build diff --git a/ci/corstone1000-fvp.yml b/ci/corstone1000-fvp.yml index e4659a3f..15865043 100644 --- a/ci/corstone1000-fvp.yml +++ b/ci/corstone1000-fvp.yml @@ -3,4 +3,10 @@ header: includes: - ci/corstone1000-common.yml +local_conf_header: + fvp-config: | + # Remove Dropbear SSH as it will not fit into the corstone1000 image. + IMAGE_FEATURES:remove = " ssh-server-dropbear" + INHERIT += "fvpboot" + machine: corstone1000-fvp diff --git a/kas/corstone1000-fvp.yml b/kas/corstone1000-fvp.yml index f4401970..b7c9fd1f 100644 --- a/kas/corstone1000-fvp.yml +++ b/kas/corstone1000-fvp.yml @@ -12,5 +12,12 @@ repos: machine: corstone1000-fvp +local_conf_header: + fvp-config: | + # Remove Dropbear SSH as it will not fit into the corstone1000 image. + IMAGE_FEATURES:remove = " ssh-server-dropbear" + INHERIT = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}" + LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" + target: - corstone1000-image diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index fc69fe84..eb122f35 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -1,9 +1,41 @@ #@TYPE: Machine #@NAME: corstone1000-fvp machine #@DESCRIPTION: Machine configuration for Corstone1000 64-bit FVP - require conf/machine/include/corstone1000.inc TFA_TARGET_PLATFORM = "fvp" TFM_PLATFORM_IS_FVP = "TRUE" + +# testimage config +TEST_TARGET = "OEFVPTarget" +TEST_SUITES = "noop" + +# FVP Config +FVP_PROVIDER ?= "fvp-corstone1000-native" +FVP_EXE ?= "FVP_Corstone-1000" +FVP_CONSOLE ?= "host_terminal_0" + +# FVP Parameters +FVP_CONFIG[se.trustedBootROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1.bin" +FVP_CONFIG[board.xnvm_size] ?= "64" +FVP_CONFIG[se.trustedSRAM_config] ?= "6" +FVP_CONFIG[se.BootROM_config] ?= "3" +FVP_CONFIG[board.hostbridge.interfaceName] ?= "tap0" +FVP_CONFIG[board.smsc_91c111.enabled] ?= "1" +FVP_CONFIG[board.hostbridge.userNetworking] ?= "true" +FVP_CONFIG[board.hostbridge.userNetPorts] ?= "5555=5555,8080=80,8022=22" +FVP_CONFIG[board.se_flash_size] ?= "8192" +FVP_CONFIG[diagnostics] ?= "4" +FVP_CONFIG[disable_visualisation] ?= "true" +FVP_CONFIG[se.nvm.update_raw_image] ?= "0" + +# Boot image +FVP_DATA ?= "board.flash0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic.nopt@0x68100000" + +# FVP Terminals +FVP_TERMINALS[host.host_terminal_0] ?= "Normal World Console" +FVP_TERMINALS[host.host_terminal_1] ?= "Secure World Console" +FVP_TERMINALS[se.secenc_terminal] ?= "Secure Enclave Console" +FVP_TERMINALS[extsys0.extsys_terminal] ?= "Cortex M3" +