From patchwork Thu Apr 20 12:46:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 22799 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 72CBBC77B73 for ; Thu, 20 Apr 2023 12:46:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.6929.1681994807719696418 for ; Thu, 20 Apr 2023 05:46:48 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 2EBCA152B for ; Thu, 20 Apr 2023 05:47:31 -0700 (PDT) Received: from jdm-VirtualBox.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4605D3F587 for ; Thu, 20 Apr 2023 05:46:47 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm-bsp/tc1: Add FVP support Date: Thu, 20 Apr 2023 08:46:42 -0400 Message-Id: <20230420124642.662700-2-jon.mason@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230420124642.662700-1-jon.mason@arm.com> References: <20230420124642.662700-1-jon.mason@arm.com> MIME-Version: 1.0 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 ; Thu, 20 Apr 2023 12:46:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4592 Add tc1 ecosystem FVP and bits to enable in the tc1 machine config file Also, do some hacks to speed things up. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 3 +++ ci/fvps.yml | 5 ++-- ci/tc1.yml | 3 ++- meta-arm-bsp/conf/machine/include/tc.inc | 5 ++++ meta-arm-bsp/conf/machine/tc1.conf | 24 +++++++++++++++++++ .../recipes-bsp/u-boot/u-boot/tc/bootargs.cfg | 3 ++- meta-arm/recipes-devtools/fvp/fvp-tc1.bb | 11 +++++++++ 7 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 meta-arm/recipes-devtools/fvp/fvp-tc1.bb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8204eaf0..df1f0f5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,6 +219,9 @@ sgi575: tc1: extends: .build + parallel: + matrix: + - TESTING: testimage tags: - x86_64 diff --git a/ci/fvps.yml b/ci/fvps.yml index e3bc5fe5..58c29d53 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -13,7 +13,8 @@ local_conf_header: target: - nativesdk-fvp-base-a-aem - - nativesdk-fvp-n1-edge - - nativesdk-fvp-sgi575 - nativesdk-fvp-corstone500 - nativesdk-fvp-corstone1000 + - nativesdk-fvp-n1-edge + - nativesdk-fvp-sgi575 + - nativesdk-fvp-tc1 diff --git a/ci/tc1.yml b/ci/tc1.yml index fd9acbd2..c1aceead 100644 --- a/ci/tc1.yml +++ b/ci/tc1.yml @@ -2,8 +2,9 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml machine: tc1 target: - - tc-artifacts-image + - core-image-minimal diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index 59a11b27..f84d55c2 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -39,3 +39,8 @@ IMAGE_FSTYPES += "cpio.gz" INITRAMFS_IMAGE ?= "core-image-minimal" SERIAL_CONSOLES = "115200;ttyAMA0" + +EXTRA_IMAGEDEPENDS += "trusted-firmware-a optee-os" +# FIXME - there is signed image dependency/race with testimage. +# This should be fixed in oe-core +TESTIMAGEDEPENDS:append = " virtual/kernel:do_deploy" diff --git a/meta-arm-bsp/conf/machine/tc1.conf b/meta-arm-bsp/conf/machine/tc1.conf index 42c5d8d5..f99bfd2b 100644 --- a/meta-arm-bsp/conf/machine/tc1.conf +++ b/meta-arm-bsp/conf/machine/tc1.conf @@ -5,3 +5,27 @@ #@DESCRIPTION: Machine configuration for TC1 require conf/machine/include/tc.inc + +TEST_TARGET = "OEFVPSerialTarget" +TEST_SUITES = "linuxboot" + +# FVP Config +FVP_PROVIDER ?= "fvp-tc1-native" +FVP_EXE ?= "FVP_TC1" + +# FVP Parameters +FVP_CONFIG[css.scp.ROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/scp_romfw.bin" +FVP_CONFIG[css.trustedBootROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1-tc.bin" +FVP_CONFIG[board.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/fip_gpt-tc.bin" + +#FVP_CONFIG[board.hostbridge.userNetworking] ?= "true" +#FVP_CONFIG[board.hostbridge.userNetPorts] ?= "8022=22" +#smsc ethernet takes a very long time to come up. disable now to prevent testimage timeout +#FVP_CONFIG[board.smsc_91c111.enabled] ?= "1" + +FVP_CONSOLE = "terminal_s1" +FVP_TERMINALS[soc.terminal_s0] ?= "Secure Console" +FVP_TERMINALS[soc.terminal_s1] ?= "Console" + +# Boot image +FVP_DATA ?= "board.dram=${DEPLOY_DIR_IMAGE}/fitImage-core-image-minimal-tc1-tc1@0x20000000" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg index 8c316024..a06c44ff 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg @@ -1,2 +1,3 @@ CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0 debug user_debug=31 earlycon=pl011,0x7ff80000 loglevel=9 androidboot.hardware=total_compute androidboot.boot_devices=1c050000.mmci ip=dhcp androidboot.selinux=permissive allow_mismatched_32bit_el0" +CONFIG_BOOTARGS="console=ttyAMA0 debug user_debug=31 earlycon=pl011,0x7ff80000 loglevel=9 androidboot.hardware=total_compute androidboot.boot_devices=1c050000.mmci androidboot.selinux=permissive allow_mismatched_32bit_el0" +CONFIG_BOOTDELAY=0 diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc1.bb b/meta-arm/recipes-devtools/fvp/fvp-tc1.bb new file mode 100644 index 00000000..4a1295cd --- /dev/null +++ b/meta-arm/recipes-devtools/fvp/fvp-tc1.bb @@ -0,0 +1,11 @@ +require fvp-ecosystem.inc + +MODEL = "TC1" +MODEL_CODE = "FVP_TC1" +PV = "11.18.28_Linux64" + +SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/TotalCompute/Total%20Compute%20Update%202022/${MODEL_CODE}_${PV_URL}.tgz;subdir=${BP}" +SRC_URI[sha256sum] = "3a2b32ecf34dc9581482d6fc682a9378ba6ed151ea9b68914b4ebad39fb5cacf" + +LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=a50d186fffa51ed55599183aad911298 \ + file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411"