From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440801196408832 X-Received: by 2002:a05:6214:cca:b0:67a:ab22:73e4 with SMTP id 10-20020a0562140cca00b0067aab2273e4mr7250214qvx.52.1704785614019; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:21e8:b0:67f:143c:57c3 with SMTP id p8-20020a05621421e800b0067f143c57c3ls833196qvj.0.-pod-prod-03-us; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtfElvD/KoYmjNoJNuRdIkQMOcRFXsF7XKuoeE0KMHJzyGTRBaDWyLH6n/FQf0ZGTdmRWI X-Received: by 2002:a05:620a:430b:b0:783:23ea:8aa8 with SMTP id u11-20020a05620a430b00b0078323ea8aa8mr2325628qko.52.1704785613145; Mon, 08 Jan 2024 23:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785613; cv=none; d=google.com; s=arc-20160816; b=0/7F+jT05N9MAByquccq+ARRrrqknIzlO8+YbgMWCX9iuSaQTxNNoAspL44sSMbIKY Do0JkUbPjkEp0t7nV09dC8zP6yFjO/4duDEuZKukC3dSH8iHXPCnOBfsa1EERKcx6J6T SXUv1Yu1dLW6w5Q4bJC0qxq7RCh4A41adJ8PciJHJQXIATBIzWgWTZfvN1n7p5yiV1y+ 28ZSr8qE7lTgrIU+HgOiGNtmfIbRaBT8O+mK6chGqK5Ny7ausZmkqIdvlxXxuBpc2wDm 50RLmUUPaFR05zEaLt4XkOrkhBBCFVQiWQhuVrJfZTpCjbf7aSbpACT0gRzLu6hueb9P DNvA== 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=eySf5EUlWh0YRfVNMGIHUatyvrGst5Uyb03Jr3Rts/Q=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=zmP6mhsKWt4co0zvs01DrQnH3kB+3Qf6JRIacJflA6kdIXsRzgZAbkfgn89b0yZNWt jd5iuMfcyUAqX30yZvicWslK+9XUlW5t6jgTgkzG2rzyBjiAxGpYEnOJvfklt04zjW8Z +I+hWzx+MytdN44UTZ+wEoUE9ZrhOceSP2wIObk+kiExYNdXusqATW1cEczHepjguS7I J5H0yEpY1dcpaIO3knzQDD23Chwwx/ZNkrLG+5jE35qUgscYr3oh/K9SsWM3munIjEWJ T8VMhZ9Mou9323t+gbeDxADWrRgU3fTEhXHRV3PrkF62g6vpCkREjZGSHSwYl74/v5qQ s0kg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EbIi4rEo; spf=pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073332c25adf8efd2d415bba-GF2wEH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EbIi4rEo; spf=pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073332c25adf8efd2d415bba-GF2wEH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073332c25adf8efd2d415bba for ; Tue, 09 Jan 2024 08:33:32 +0100 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=eySf5EUlWh0YRfVNMGIHUatyvrGst5Uyb03Jr3Rts/Q=; b=EbIi4rEoG96L8p6Go9ZCdARZwmhFci1aR7inP2puS/M233VUjl6QQ7kGm+3eIKd7KqIkGo ntuOOGNWB2bmYvlpB/dMnjPtZBEx0tmbeQPbRrBiWivMAYqC0fsFUT8iDAjow2ve7G5IxLyZ eYZmoya0NnFb2Jbh06pArCXdn6p98=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 6/8] meta-isar: starfive-visionfive2: Drop obsolete recipes Date: Tue, 9 Jan 2024 08:33:22 +0100 Message-Id: <91c1b5a012e9eafe12569f9ad5f02177f427b9f7.1704785604.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: cm59/o1fx7Ya 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 | 32 --------------- .../files/rules.tmpl | 12 ------ .../files/visionfive2-u-boot-firmware.install | 1 - .../visionfive2-uboot-fit-image.its.tmpl | 41 ------------------- .../visionfive2-u-boot-firmware.bb | 38 ----------------- 7 files changed, 135 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 c004c86c..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb +++ /dev/null @@ -1,32 +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:native, u-boot-starfive-visionfive2:${DISTRO_ARCH}" - -# this is a host tool -PACKAGE_ARCH = "${BUILD_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}" - -COMPATIBLE_MACHINE = "starfive-visionfive2" 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 4fe91b45..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb +++ /dev/null @@ -1,38 +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}" - -COMPATIBLE_MACHINE = "starfive-visionfive2" -- 2.35.3