From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325025390560280576 X-Received: by 2002:a4a:655d:0:b0:598:45be:2ca7 with SMTP id z29-20020a4a655d000000b0059845be2ca7mr4396444oog.11.1705490379210; Wed, 17 Jan 2024 03:19:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:af02:0:b0:599:25d8:29af with SMTP id w2-20020a4aaf02000000b0059925d829afls392349oon.2.-pod-prod-09-us; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IG4OKUUiabxqmXtfbM0OOPHl0MDvf6ruwcOWtek8nQ6D+Yw2TgcGAD6gaIwsmInnEBZ/433 X-Received: by 2002:a9d:784c:0:b0:6dd:d7db:9863 with SMTP id c12-20020a9d784c000000b006ddd7db9863mr10839962otm.50.1705490377965; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=IV2jYl2OX/ukNJwKADKJo0ksSmsgRgiZkJ+7RIL6d7rls1jQqw4kN0iAb22Sc+ADUK cj2W+sbO5H5oKpGp8w2DzC+1B2bRKgNUaKSqscb+ZyUOxVVN1WGC+M+p/ehcDTb8TT5Q 18F5Ndum1Xk9bH2as12YMaAr0YfgFT0zvY0a7UC4K4P2k42sN3fK8YhJWvdZUqiVfAwc hOBJff3jBloDWYMAzsqnR2i2iL6kfS92MZbqclUAZYeesHEAviDCj3CoYksc3LjMZIop pIITQjDVObjhCg48m1neWy4BWXH+KVj6VkTrUCbKSaBeP0FqKaCPwOFVCySM/BnEY3Ki Pi+g== 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=E99OZKhDm1RZZ3WnNL9xKN4SyuUs5p1zKSEHAQpci6cQCYksJ6MW8+UuJyL3fefwYI xKpOZJkMOJAEKyeetEny9iWV2d1knmvQF4ilooXDL21/JDSfGmhoohzaBZ940iw8UGN6 EkKBFRKxvYkOoU5XqQmN7jPiegu/RetpVbfva7BiZgmFwiBd9wEHAUTj1Rr6Xg8qMZ0y WOusq3PVkNvwn0J4EXff4H0AHVsl5whqPWNqMOV2KXipwnVmZ5pvl7Z90BGFOc0W1hK7 d8TI7vWZNuCH0u/Aie2/Amml+wpHtqRopP1Qhuh4f1kH7qOJ33DLaeZwlILbaT3Vk2EU wzHg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jg8jFNKt; spf=pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401171119358870b3516e05bb5b28-AzdVj4@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 s23-20020a05683004d700b006dbb6f37f29si931320otd.2.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@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=jg8jFNKt; spf=pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401171119358870b3516e05bb5b28-AzdVj4@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 202401171119358870b3516e05bb5b28 for ; Wed, 17 Jan 2024 12:19:35 +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=jg8jFNKtH2pL7spqIa3unN1j6nsSF1HM26V3RbRb2ehCIuKhABWNV0QHcRR80ezD98pCxr WWLYbAMIpH0LDa9rGlZnjkUCZp4MNxfR3LKIkno6cCD50BawyIM1muNUCUz192JpIEjcNG/0 rBnJqdeAI1fWtsotxHMTnXmU00PIA=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 7/8] meta-isar: starfive-visionfive2: Drop obsolete recipes Date: Wed, 17 Jan 2024 12:19:32 +0100 Message-Id: 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: 0/9SHD8mmUYL 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