From patchwork Wed Oct 11 13:02:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 31995 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 76923CD98EA for ; Wed, 11 Oct 2023 16:09:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20617.1697040547450910490 for ; Wed, 11 Oct 2023 09:09:08 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 9AE4E14BF for ; Wed, 11 Oct 2023 09:09:47 -0700 (PDT) Received: from debian.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 C41FF3F7A6 for ; Wed, 11 Oct 2023 09:09:06 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm/boot-wrapper-aarch64: remove recipe Date: Wed, 11 Oct 2023 08:02:02 -0500 Message-Id: <20231011130203.3871606-1-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 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 ; Wed, 11 Oct 2023 16:09:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5108 fvp-baser was the only user of this recipe. Since that has been removed, remove this as well. Signed-off-by: Jon Mason --- .../boot-wrapper-aarch64_git.bb | 95 ------------------- scripts/machine-summary.py | 1 - 2 files changed, 96 deletions(-) delete mode 100644 meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb diff --git a/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb b/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb deleted file mode 100644 index 775f4064..00000000 --- a/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY = "Linux aarch64 boot wrapper with FDT support" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git;branch=master" -SRCREV = "d3b1a15d18542b2086e72bfdc3fc43f454772a3b" - -# boot-wrapper doesn't make releases -UPSTREAM_CHECK_COMMITS = "1" - -PV = "0+git" - -S = "${WORKDIR}/git" - -inherit autotools deploy - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE ?= "invalid" - -# Device tree to put in the image -# by default use the standard kernel devicetree -# This should be overwritten if the devicetree is not generated -# by the kernel. -# This should point to a file in the deploy image directory -BOOT_WRAPPER_AARCH64_DEVICETREE ??= "${KERNEL_DEVICETREE}" - -# Kernel image to put in the image -# This should point to a file in the deploy image directory -BOOT_WRAPPER_AARCH64_KERNEL ??= "Image" - -# Kernel command line for the image -BOOT_WRAPPER_AARCH64_CMDLINE ??= "rw" - -# Image generated by boot wrapper -BOOT_WRAPPER_AARCH64_IMAGE ??= "linux-system.axf" - -DEPENDS += "virtual/kernel dtc-native" - -EXTRA_OECONF += "--with-kernel-dir=${WORKDIR}/kernel" -EXTRA_OECONF += "--with-dtb=${WORKDIR}/kernel/dummy.dtb" -EXTRA_OECONF += "--with-cmdline=\"\"" -EXTRA_OECONF += "--enable-psci --enable-gicv3" - -# unset LDFLAGS solves this error when compiling kernel modules: -# aarch64-poky-linux-ld: unrecognized option '-Wl,-O1' -EXTRA_OEMAKE += "'LDFLAGS= --gc-sections '" - -# Strip prefix if any -REAL_DTB = "${@os.path.basename(d.getVar('BOOT_WRAPPER_AARCH64_DEVICETREE'))}" - -EXTRA_OEMAKE += "'KERNEL_DTB=${DEPLOY_DIR_IMAGE}/${REAL_DTB}'" -EXTRA_OEMAKE += "'KERNEL_IMAGE=${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_KERNEL}'" -EXTRA_OEMAKE += "'CMDLINE=${BOOT_WRAPPER_AARCH64_CMDLINE}'" - - -do_configure:prepend() { - # Create dummy files to make configure happy. - # We will pass the generated ones directly to make. - mkdir -p ${WORKDIR}/kernel/arch/arm64/boot - echo "dummy" > ${WORKDIR}/kernel/arch/arm64/boot/Image - echo "dummy" > ${WORKDIR}/kernel/dummy.dtb - - # Generate configure - (cd ${S} && autoreconf -i || exit 1) -} - -do_compile[noexec] = "1" -do_install[noexec] = "1" - -# We need the kernel to create an image -do_deploy[depends] += "virtual/kernel:do_deploy" - -do_deploy() { - if [ ! -f ${DEPLOY_DIR_IMAGE}/${REAL_DTB} ]; then - echo "ERROR: cannot find ${REAL_DTB} in ${DEPLOY_DIR_IMAGE}" >&2 - echo "Please check your BOOT_WRAPPER_AARCH64_DEVICETREE settings" >&2 - exit 1 - fi - - if [ ! -f ${DEPLOY_DIR_IMAGE}/${BOOT_WRAPPER_AARCH64_KERNEL} ]; then - echo "ERROR: cannot find ${BOOT_WRAPPER_AARCH64_KERNEL}" \ - " in ${DEPLOY_DIR_IMAGE}" >&2 - echo "Please check your BOOT_WRAPPER_AARCH64_KERNEL settings" >&2 - exit 1 - fi - - oe_runmake clean - oe_runmake all - - install -D -p -m 644 ${BOOT_WRAPPER_AARCH64_IMAGE} \ - ${DEPLOYDIR}/linux-system.axf -} -addtask deploy before do_build after do_compile diff --git a/scripts/machine-summary.py b/scripts/machine-summary.py index 0f5d1d99..3038237c 100755 --- a/scripts/machine-summary.py +++ b/scripts/machine-summary.py @@ -146,7 +146,6 @@ recipes = ("virtual/kernel", "u-boot", "optee-os", "hafnium", - "boot-wrapper-aarch64", "gator-daemon", "opencsd", "gcc-aarch64-none-elf-native",