From patchwork Wed Jan 17 11:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3305 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f61.google.com (mail-oo1-f61.google.com [209.85.161.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJk8T032563 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:47 +0100 Received: by mail-oo1-f61.google.com with SMTP id 006d021491bc7-598f58b95c7sf3233008eaf.1 for ; Wed, 17 Jan 2024 03:19:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490379; cv=pass; d=google.com; s=arc-20160816; b=RuweneEygZXWTPCfAgfutWIeVdK/lyf1m8+pGMryJoQ/e7avKUBS74bNDF4ub3628Q WFJecjO6dXQ30yfXg4PXf1EMi7bSXhzlqF64gBBwGSCvbEv1z87HrblgWRdxDpCYwQ2w t6HFhdq9/N+cnRgJCAvQjqmH+qpPJy0a7lmdP1IFA/5wFVZc9th3BFqLIfTSEI0aB8wi xVn5cP3G3EOnHBbGOR0+kN66Rk9LbXr5Gu0QwhIfiFxPi5XsI5mQ4TwLBhV+u1fYxl5l vqWQeo9EDC5QvBicMUO5iKPEOHUpjXkSwoB/DqO+CJ9bWE3A86Om4AZn9gsz+Ag3Fkr1 2ctA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=oFoEA1YIxC7Onm5Tes1jvz+TdHMWXB/HriRu38++E1tX6nIukqDnK7VDhMXXifQrOd Lu5WSKOlwk/FwMFJugtGfowS/dhVrk+SWAl4x1Xs5cgr3wQjJQNx4YZWRy1HZ+7hoNxt GqDIGW+DPK0zyORE4hSvWqBjtYpvtlV0EVmVdOKO8jgSVij/XZ4jOfJdeJs+z6Slhjnf 410UoJ6qcMoVqExoajyckiq0NM7oyh89gP7z7dm6ReormkoLxvs1E/CQxoCCUgTw+iTq RmULmuEyPZPJtmUegmowIcTk/qOp21QASRhb/crGNWhWeJfvauVGAHg1Yp/vJ4MGABNb WGQQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1705490379; x=1706095179; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; b=FIz9zmeJZJUWUR/XlC/4P6VOmeuSDiJ50cHI87B4e9wTgAxx+xbyG9jQ/74KvuGcGT oWfo0EWI9DyB8dMELUOYgyTOvlA481JhYZWVWp6VhIk+eKnfLl2nbX6KCtPm9rNWQ7Im ZFIleqifY8Q8hCKN8ajgOuG3Duff1x6tzHoGMfUlNC2j8hMkDeYARPRkagkrUrcyYken 6fsIN1noFWH2i7HiO4OclwYUalSYiWJBpZjhOZJuET6gNCCdET9BZM7Nv8fdtWipeTkm iKUXCUC/ulIJ2l924ZV6rthFCrU00Zv11sV9z2z0E/pTGWwtHG9j12SKVkX9sFbjEYKs p1Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490379; x=1706095179; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; b=qf7+dltqiNI81lsMT8EQCGBUDPXvJUyPFRLn6PCK+WOOnNeKqjd5ysY6dX5WeiVjPf orb76SPuqp3bGkXPi8/L7saJjU2f21+tA3FTNFnASSkxztNZCP2HzpAdGgn+D/jZ+tQX Fsn3bnYvpOmSEQXnaHl3OC0Gbgn3o+BN545AmmeOXEUbeNHMH/mq9+DrzIcyqeuSOeWO HDUrCQVKvQ0wLoNM55D8Fnj8YkNjejQTG+savKa6u/qAjBE3OC0TrC7W5+W4cFVpX7dl m1bzu10yn9ojURUbLBzhWNLGIkYsCudnUOXIk7vnbrtCLb+ugpAmQqxGwHbrruLeyOGq m47g== X-Gm-Message-State: AOJu0YydNK+YRirGB40EGMfsPpxawsmbKNMWr70aS8IvNXrCooXCdwt3 +jZfg6+wjJzmBeGiXI+8Q5U= X-Google-Smtp-Source: AGHT+IGg4QUiAq2sEEj8flNu0QER/sB0oh6+3+15oIECHpZQz3Gm7XpXR02yVv02KsRAwn8pvFAnXw== X-Received: by 2002:a4a:1781:0:b0:594:c97:2e3c with SMTP id 123-20020a4a1781000000b005940c972e3cmr5979625ooe.3.1705490379128; 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-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 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; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202401171119358870b3516e05bb5b28 for ; Wed, 17 Jan 2024 12:19:35 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-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 X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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"