From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7240866782458675200 X-Received: by 2002:a05:600c:244:b0:3f4:27db:d with SMTP id 4-20020a05600c024400b003f427db000dmr5797229wmj.17.1685895673457; Sun, 04 Jun 2023 09:21:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b08:b0:3f7:678a:7b9 with SMTP id m8-20020a05600c3b0800b003f7678a07b9ls316888wms.1.-pod-prod-02-eu; Sun, 04 Jun 2023 09:21:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ41sQYP2tWWQ37SMjOUi9lJtyBIJJKm0ZavdzTEJ+WAeKizKFdIisrDQFYvZbWRiltz+MRR X-Received: by 2002:a05:600c:3793:b0:3f6:455:de09 with SMTP id o19-20020a05600c379300b003f60455de09mr5826562wmr.39.1685895672012; Sun, 04 Jun 2023 09:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685895672; cv=none; d=google.com; s=arc-20160816; b=rPjxtT8HXAwQkFj1zuTCjcfGS7lO0085U6weEnHYnBEZB77G3dtJzwRg2czwp/DhYh YdFXpwn7xmw+TobBrAKFusYFD1UheIGprtYNmL55nzBcImDoXMqtQNtfHcqDj/SQVU72 jiTJg/FMErjr0Wjp9sU8ivE3UI8Ri5nYrM7Y0oLbs4C0m3CI8amW2lHwAHhgSdK9ti0L dZ7EBRruvwaYH1ipYMUhPhJPVG0gWsyY0QMsKEC2ax8Rz9BPjlRs9Lux4aVMvb0YUU2R AgrTQQf9Eduw+ff3bx7qSXzPaP38ldJlskmwvIDyn4p1CwHOxObYQRIr0K3tjQ1wgARN 4WdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ifDP0Hdg0sqce7RG7seTrMjryHYJoXIxSJDUCOaRTHg=; b=m8o0Wo0WQyn2w/gdAig23ohfPS6Sri69KDyLIojfWGby4ar492liDYZuIb7aa2b60/ VO4mDFqKntiHZ3/bExNG9I1yQRcMekCwufV0ImOgPch07ldcVtwYLjulo6gPK3h5wISr 0sN5g6tvsxv9y3uwGf1ySBk8YrKzR/DkgJ8fhGExoD75jjoAi96pFtaAefU7jzqqR/Ho hFlMYVYKro7Wq1j0BZ0xdd+bZigzgtpC8LEXV1iI4OU9u8v6KCriAr6ipFjRIqDbgpFC JGKalhIONYgmYrtGceolKDa1vzRLVSY+aDNXiyKelcTvZgothCrpw3bEWZiURGltXf6I zmUQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UCzgBzXT; spf=pass (google.com: domain of fm-294854-2023060416211159f6dc9228f28568be-f20r_o@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-2023060416211159f6dc9228f28568be-f20r_o@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id bh6-20020a05600c3d0600b003f605aae39csi490281wmb.1.2023.06.04.09.21.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2023 09:21:11 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2023060416211159f6dc9228f28568be-f20r_o@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UCzgBzXT; spf=pass (google.com: domain of fm-294854-2023060416211159f6dc9228f28568be-f20r_o@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-2023060416211159f6dc9228f28568be-f20r_o@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2023060416211159f6dc9228f28568be for ; Sun, 04 Jun 2023 18:21:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=ifDP0Hdg0sqce7RG7seTrMjryHYJoXIxSJDUCOaRTHg=; b=UCzgBzXT/7pshUSTXJVkScsUeX4mdigXzu5FYpxXG8hheV10U7wwZK5UOuFsc3qLRYYTgR PeCd8KTjzUXE5KFMZNA3/rNLmT1Iez2YklqEM4WBPiuwh/qZbT9dFKci/tuXeSwnDVUjZxUO j9kCgL5LhrF45tvBSmD5Rnf54lV00=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH 6/6] meta-isar: starfive-visionfive2: Drop obsolete recipes Date: Sun, 4 Jun 2023 18:21:09 +0200 Message-Id: <93ce7aca920a8e0e075e6934154d11692f580ae8.1685895669.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: O9XkwLRC6ZwA From: Jan Kiszka We are now using U-Boot for what these recipes where once introduced. Signed-off-by: Jan Kiszka --- .../jh7110-u-boot-spl-image/files/install | 1 - .../jh7110-u-boot-spl-image/files/rules | 10 ----- .../jh7110-u-boot-spl-image_0.1.bb | 30 -------------- .../files/rules.tmpl | 12 ------ .../files/visionfive2-u-boot-firmware.install | 1 - .../visionfive2-uboot-fit-image.its.tmpl | 41 ------------------- .../visionfive2-u-boot-firmware.bb | 36 ---------------- 7 files changed, 131 deletions(-) delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install deleted file mode 100644 index c300f842..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install +++ /dev/null @@ -1 +0,0 @@ -u-boot-spl.bin.normal.out usr/share/jh7110-uboot-spl-image diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules deleted file mode 100644 index a8b2c6b8..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/make -f - -U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin - -override_dh_auto_build: - cp $(U_BOOT_SPL_BIN) u-boot-spl.bin - spl_tool -c -f u-boot-spl.bin - -%: - dh \$@ diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb deleted file mode 100644 index f237a9c3..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -inherit dpkg - -SRC_URI = "file://rules file://install" - -DESCRIPTION = "StarFive VisionFive 2 u-boot SPL" -DEPENDS = "jh7110-u-boot-spl-tool-native u-boot-starfive-visionfive2" -DEBIAN_BUILD_DEPENDS = "jh7110-u-boot-spl-tool, u-boot-starfive-visionfive2:${DISTRO_ARCH}" - -# this is a host tool -PACKAGE_ARCH = "${HOST_ARCH}" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build(){ - deb_debianize - cp ${WORKDIR}/install ${S}/debian/ -} - -do_deploy() { - dpkg --fsys-tarfile ${WORKDIR}/jh7110-u-boot-spl-image_${PV}*.deb | \ - tar xOf - "./usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" \ - > "${DEPLOY_DIR_IMAGE}/u-boot-spl.bin.normal.out" -} - -addtask deploy after do_dpkg_build before do_build -do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl deleted file mode 100644 index 4826f7d6..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f - -KERNEL_VERSION=$(shell find /usr/lib/ -maxdepth 1 -type d -name 'linux-image-*' | head -1 | sed 's/.*linux-image-//g') - -override_dh_auto_configure: - sed -i 's||$(KERNEL_VERSION)|g' visionfive2-uboot-fit-image.its - -override_dh_auto_build: - mkimage -A riscv -O u-boot -f ${IMAGE_ITS_FILE} visionfive2_fw_payload.img - -%: - dh $@ diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install deleted file mode 100644 index d1bdf6d6..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install +++ /dev/null @@ -1 +0,0 @@ -visionfive2_fw_payload.img usr/share/visionfive2-u-boot-firmware diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl deleted file mode 100644 index 4cbe9318..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl +++ /dev/null @@ -1,41 +0,0 @@ -/dts-v1/; - -/ { - description = "U-boot-spl FIT image for JH7110 VisionFive2"; - #address-cells = <2>; - - images { - firmware { - description = "u-boot"; - data = /incbin/("/usr/lib/opensbi/starfive-visionfive2/fw_payload.bin"); - type = "firmware"; - arch = "riscv"; - os = "u-boot"; - load = <0x0 0x40000000>; - entry = <0x0 0x40000000>; - compression = "none"; - }; - fdt { - description = "DTB"; - data = /incbin/("/usr/lib/linux-image-/${DTB_FILES}"); - type = "flat_dt"; - arch = "riscv"; - compression = "none"; - load = <0x46000000>; - entry = <0x46000000>; - hash { - algo = "sha1"; - }; - }; - }; - - configurations { - default = "config-1"; - - config-1 { - description = "U-boot-spl FIT config for JH7110 VisionFive2"; - firmware = "firmware"; - fdt = "fdt"; - }; - }; -}; diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb deleted file mode 100644 index b2303968..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -inherit dpkg - -DESCRIPTION = "StarFive VisionFive 2 u-boot firmware" - -IMAGE_ITS_FILE = "visionfive2-uboot-fit-image.its" -SRC_URI = " \ - file://${IMAGE_ITS_FILE}.tmpl \ - file://rules.tmpl \ - file://visionfive2-u-boot-firmware.install" - -DEPENDS += "opensbi-starfive-visionfive2 linux-image-${KERNEL_NAME}" -DEBIAN_BUILD_DEPENDS += "opensbi-starfive-visionfive2, u-boot-tools, device-tree-compiler, linux-image-${KERNEL_NAME}" - -TEMPLATE_FILES = "${IMAGE_ITS_FILE}.tmpl rules.tmpl" -TEMPLATE_VARS = "IMAGE_ITS_FILE DTB_FILES" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build(){ - cp ${WORKDIR}/${IMAGE_ITS_FILE} ${S}/ - cp ${WORKDIR}/visionfive2-u-boot-firmware.install ${S}/debian/ - deb_debianize -} - -do_deploy() { - dpkg --fsys-tarfile ${WORKDIR}/visionfive2-u-boot-firmware_${PV}*.deb | \ - tar xOf - "./usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" \ - > "${DEPLOY_DIR_IMAGE}/visionfive2_fw_payload.img" -} - -addtask deploy after do_dpkg_build before do_build -do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" -- 2.35.3