From patchwork Wed May 18 13:36:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 8230 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 3A7D6C4332F for ; Wed, 18 May 2022 13:36:37 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.5064.1652880989547498305 for ; Wed, 18 May 2022 06:36:30 -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 11C3B23A for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E8DBD3F73D for ; Wed, 18 May 2022 06:36:28 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm/scp: remove support for version 2.9 Date: Wed, 18 May 2022 09:36:21 -0400 Message-Id: <20220518133624.24874-1-jon.mason@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 ; Wed, 18 May 2022 13:36:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3436 Signed-off-by: Jon Mason --- .../scp-firmware/scp-firmware_2.10.%.bbappend | 3 + .../scp-firmware/scp-firmware_2.9.%.bbappend | 10 --- .../scp-firmware/scp-firmware_2.9.0.bb | 83 ------------------- 3 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend delete mode 100644 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend index b4f5487d..bb1a48c7 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend @@ -2,6 +2,9 @@ MACHINE_SCP_REQUIRE ?= "" +MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc" +MACHINE_SCP_REQUIRE:n1sdp = "scp-firmware-n1sdp.inc" +MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc" MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc" require ${MACHINE_SCP_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend deleted file mode 100644 index bb1a48c7..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.9.%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -# Include machine specific SCP configurations - -MACHINE_SCP_REQUIRE ?= "" - -MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc" -MACHINE_SCP_REQUIRE:n1sdp = "scp-firmware-n1sdp.inc" -MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc" -MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc" - -require ${MACHINE_SCP_REQUIRE} diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb deleted file mode 100644 index f95d968f..00000000 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.9.0.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "SCP and MCP Firmware" -DESCRIPTION = "Firmware for SCP and MCP software reference implementation" -HOMEPAGE = "https://github.com/ARM-software/SCP-firmware" - -LICENSE = "BSD-3-Clause & Apache-2.0" -LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \ - file://contrib/cmsis/git/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https;branch=master" - -SRCREV = "77ffab90a9f6071850475087cc5d40610c621126" - -PROVIDES += "virtual/control-processor-firmware" - -SCP_BUILD_RELEASE ?= "1" -SCP_PLATFORM ?= "invalid" -SCP_COMPILER ?= "arm-none-eabi" -SCP_LOG_LEVEL ?= "WARN" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/arm-none-eabi-gcc-native" -# For now we only build with GCC, so stop meta-clang trying to get involved -TOOLCHAIN = "gcc" - -SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}" - -inherit deploy - -B = "${WORKDIR}/build" -S = "${WORKDIR}/git" - -# Allow platform specific copying of only scp or both scp & mcp, default to both -FW_TARGETS ?= "scp mcp" -FW_INSTALL ?= "ramfw romfw" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE ?= "invalid" - -LDFLAGS[unexport] = "1" - -# No configure -do_configure[noexec] = "1" - -EXTRA_OEMAKE = "V=1 \ - BUILD_PATH='${B}' \ - PRODUCT='${SCP_PLATFORM}' \ - MODE='${SCP_BUILD_STR}' \ - LOG_LEVEL='${SCP_LOG_LEVEL}' \ - CC='${SCP_COMPILER}-gcc' \ - AR='${SCP_COMPILER}-ar' \ - SIZE='${SCP_COMPILER}-size' \ - OBJCOPY='${SCP_COMPILER}-objcopy' \ - " - -do_compile() { - oe_runmake -C "${S}" -} -do_compile[cleandirs] += "${B}" - -do_install() { - install -d ${D}/firmware - for FW in ${FW_TARGETS}; do - for TYPE in ${FW_INSTALL}; do - install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/${SCP_BUILD_STR}/bin/${FW}_${TYPE}.bin" "${D}/firmware/" - install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/${SCP_BUILD_STR}/bin/${FW}_${TYPE}.elf" "${D}/firmware/" - done - done -} - -FILES:${PN} = "/firmware" -SYSROOT_DIRS += "/firmware" - -FILES:${PN}-dbg += "/firmware/*.elf" -# Skip QA check for relocations in .text of elf binaries -INSANE_SKIP:${PN}-dbg = "arch textrel" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_PACKAGE_STRIP = "1" - -do_deploy() { - # Copy the images to deploy directory - cp -rf ${D}/firmware/* ${DEPLOYDIR}/ -} -addtask deploy after do_install From patchwork Wed May 18 13:36:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 8228 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 3581EC433EF for ; Wed, 18 May 2022 13:36:37 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.4952.1652880989702545655 for ; Wed, 18 May 2022 06:36:30 -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 3C7411042 for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 212413F73D for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm/linux-yocto: remove tcpci for generic-arm64 Date: Wed, 18 May 2022 09:36:22 -0400 Message-Id: <20220518133624.24874-2-jon.mason@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220518133624.24874-1-jon.mason@arm.com> References: <20220518133624.24874-1-jon.mason@arm.com> 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 ; Wed, 18 May 2022 13:36:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3437 Per the comment, it's not necessary post 5.12. Signed-off-by: Jon Mason --- meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg | 2 -- meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg b/meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg deleted file mode 100644 index 33205a9a..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto/tcpci.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# The upstream defconfig has this in 5.12 onwards, but until then set it manually. -CONFIG_TYPEC_TCPCI=m diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend index 6658b91a..14cc6df1 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,10 +1,6 @@ ARMFILESPATHS := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" -FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}" -SRC_URI:append:generic-arm64 = " \ - file://tcpci.cfg \ - " FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}" SRC_URI:append:qemuarm64-secureboot = " \ From patchwork Wed May 18 13:36:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 8231 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 1EFF8C433F5 for ; Wed, 18 May 2022 13:36:47 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.5018.1652880990105458536 for ; Wed, 18 May 2022 06:36:30 -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 6D6A3106F for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4EF823F73D for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm-autonomy: remove README Date: Wed, 18 May 2022 09:36:23 -0400 Message-Id: <20220518133624.24874-3-jon.mason@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220518133624.24874-1-jon.mason@arm.com> References: <20220518133624.24874-1-jon.mason@arm.com> 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 ; Wed, 18 May 2022 13:36:47 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3438 meta-arm-autonomy has been EOLed for a release now. Remove the README and directory. Signed-off-by: Jon Mason --- meta-arm-autonomy/README.md | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 meta-arm-autonomy/README.md diff --git a/meta-arm-autonomy/README.md b/meta-arm-autonomy/README.md deleted file mode 100644 index 2e02a7f2..00000000 --- a/meta-arm-autonomy/README.md +++ /dev/null @@ -1,23 +0,0 @@ -meta-arm-autonomy Yocto Layer -============================= - -The meta-arm-autonomy layer is being deprecated from master, with bug fixes -only being applied to the following branches. Additionally, all support and -maintenance of meta-arm-autonomy will stop as per the schedule below. - - honister: End-of-life scheduled to June 2022 - hardknot: End-of-life scheduled to December 2021 - gatesgarth: End-of-life scheduled to October 2021 - dunfell: End-of-life scheduled to October 2021 - master: End-of-life scheduled to October 2021 and code removed - - -Contributing ------------- -This project has not put in place a process for contributions currently. If you -would like to contribute, please contact the maintainers - - -Maintainer(s) -------------- -* Diego Sueiro From patchwork Wed May 18 13:36:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 8229 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 399E4C433F5 for ; Wed, 18 May 2022 13:36:37 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.5065.1652880990013513679 for ; Wed, 18 May 2022 06:36:30 -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 9D7901474 for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 818BD3F73D for ; Wed, 18 May 2022 06:36:29 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/machine: used QB_GRAPICS Date: Wed, 18 May 2022 09:36:24 -0400 Message-Id: <20220518133624.24874-4-jon.mason@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220518133624.24874-1-jon.mason@arm.com> References: <20220518133624.24874-1-jon.mason@arm.com> 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 ; Wed, 18 May 2022 13:36:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3439 QB_OPT_APPEND is being used for the graphics parameters, use QB_GRAPHICS instead. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/musca-b1.conf | 2 +- meta-arm-bsp/conf/machine/musca-s1.conf | 2 +- meta-arm-bsp/conf/machine/qemu-cortex-r5.conf | 2 +- meta-arm/conf/machine/microbit-v1.conf | 2 +- meta-arm/conf/machine/qemu-cortex-a53.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf index 073c466e..a7895b81 100644 --- a/meta-arm-bsp/conf/machine/musca-b1.conf +++ b/meta-arm-bsp/conf/machine/musca-b1.conf @@ -16,7 +16,7 @@ IMAGE_CLASSES += "qemuboot" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine musca-b1" QB_CPU = "-cpu cortex-m33" -QB_OPT_APPEND = "-nographic -vga none" +QB_GRAPHICS = "-nographic -vga none" QB_MEM = "512k" QB_RNG = "" diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf index d18c06c2..0cfd56e0 100644 --- a/meta-arm-bsp/conf/machine/musca-s1.conf +++ b/meta-arm-bsp/conf/machine/musca-s1.conf @@ -15,7 +15,7 @@ IMAGE_CLASSES += "qemuboot" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine musca-s1" QB_CPU = "-cpu cortex-m33" -QB_OPT_APPEND = "-nographic -vga none" +QB_GRAPHICS = "-nographic -vga none" QB_MEM = "512k" QB_RNG = "" diff --git a/meta-arm-bsp/conf/machine/qemu-cortex-r5.conf b/meta-arm-bsp/conf/machine/qemu-cortex-r5.conf index 29b37d79..5a0ea69b 100644 --- a/meta-arm-bsp/conf/machine/qemu-cortex-r5.conf +++ b/meta-arm-bsp/conf/machine/qemu-cortex-r5.conf @@ -13,7 +13,7 @@ QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine xlnx-zcu102" QB_CPU = "-cpu cortex-r5" QB_MEM = "-m 64k" -QB_OPT_APPEND = "-nographic -vga none" +QB_GRAPHICS = "-nographic -vga none" QB_RNG = "" # Zephyr RTOS settings diff --git a/meta-arm/conf/machine/microbit-v1.conf b/meta-arm/conf/machine/microbit-v1.conf index 1fa2532f..6b18191e 100644 --- a/meta-arm/conf/machine/microbit-v1.conf +++ b/meta-arm/conf/machine/microbit-v1.conf @@ -14,7 +14,7 @@ TCLIBC = "newlib" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine microbit" QB_CPU = "-cpu cortex-m0" -QB_OPT_APPEND = "-nographic -vga none" +QB_GRAPHICS = "-nographic -vga none" QB_RNG = "" # Zephyr RTOS settings diff --git a/meta-arm/conf/machine/qemu-cortex-a53.conf b/meta-arm/conf/machine/qemu-cortex-a53.conf index b97cde7e..7147face 100644 --- a/meta-arm/conf/machine/qemu-cortex-a53.conf +++ b/meta-arm/conf/machine/qemu-cortex-a53.conf @@ -11,7 +11,7 @@ TCLIBC = "newlib" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a53" -QB_OPT_APPEND = "-nographic -vga none" +QB_GRAPHICS = "-nographic -vga none" # Zephyr RTOS settings ZEPHYR_BOARD = "qemu_cortex_a53"