From patchwork Tue Jan 9 07:33:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3270 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f185.google.com (mail-qt1-f185.google.com [209.85.160.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XeON021608 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:41 +0100 Received: by mail-qt1-f185.google.com with SMTP id d75a77b69052e-4299dfcdc0fsf2237991cf.1 for ; Mon, 08 Jan 2024 23:33:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785614; cv=pass; d=google.com; s=arc-20160816; b=ypvZJoL7+RxCkXN+QeEyoft1TGio6LhribDHWh9z5p8BHNuw4mf1P5HTaOxZ9zslEb UaVCaXa0WTi85mS6BHg8VkXTVpWiT4RaI7LPMD96b70WTTguAVuZi81KcXEQ3B7Jr39s ntDSxM8OQB1wXxJZYHUbFj56Bo4CyX+9kTPI8DFnoO0BZrU/LOcGM7hQvGolHA15F5Xf /MjLFhYg/b4gPuuM/U+pF2iCBXFvdJXbnOxUckd/BB+bQPjAKFzYuqKLL4lm4k3ZCiS9 NE9IE6gMlKTtSHJrfDM3YlakU/WnVPC/3XEGq0/slCJqqcqnOM91sq9suPet7r535hXG e3Ig== 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=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=j1ZRxSg9Q5KrZBK8gWs4VswaEmn7fEKQU+sanWD6ptY7FzJ4QJidLA4KyfTxCTAQbl hSKQWah2yTA4GUgChy73d9suDDfL9czPn1ohFRRBQgRYIb9VVQZuXbDh7I6k03/y8mgM iiGqO6zZCZ83hbXvibsbGziswCunPTXh9rWqCj5zgT9CBJvITc8beSAhKlX0G0DXHOe7 jQrHElkya1bHPckhJJltpFkqbOkw6sxAEIfkC38jdqyjh6KKte7fi2Az+Rm4gl/dUETe MNE/RaUaK/bR89JRQc07rFwmtLkWMef6/NU9Dz/mBVDBQ0yeMBroQLrttVGugLbTKRLV qPvw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785614; x=1705390414; 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=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; b=p00lYfJQOv2zaqjoHf/Q3kbYcAWehOtPl4odYZP1pXalF+0gTm775wm/KxQck/Czct rh55X/GUJcbaC5mtPrAs/c0Vyx1x5gPVC+qCCQiC+u4TOODWnsdKcSMI5G+//bEw+n5R gLFPvHEr3k0rfq1wHuWbou2RIruK890NyjE/y8S9OfFQyhtvDA4DORKMVS5zAjSaWQja Zlg3KMLp1KRwCWhcGMbkvlncfPEs9rHsnGZhCtWIroAizOkFFhy7pM5MfgIcAUes/Hyd Z/RngSjHR6lk6nf/n1Ao+X5BPNlCQiu/EuQHik4vHucBi4vaqzdaB8zJ7kj6Um1mXbUa dryg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785614; x=1705390414; 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=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; b=H9hFMTUg9jYKSux6sygYhR3JEyKxKMN3LLSwrx7HRbLBREZloK1ws12OhAa1pUiFwD QVPaJmwz6QCKxM1AV939CD5F1c+jocKx24cNxi2hovCJTznnPU5kGSgVCHn0SNaCZrur EJ9mUkDx2gVxHScaqTx19xpO01+yaJGjbnXJTJn5ttLoMkMy2ldsgiLFPA4e1gfdhVy1 +WUD7JIu8E4yZ5LNnep7KZF0HXB6GPDuxDlNHxG+iqKmFvVTDLiV1ghxr5mX3KZNc2Z3 N6Ioa9TrazGQMGzP6Vn85jpmAQRH8dTpGL1iP9kxVdOkG7toOBkx8T3duXTpNGgGUNYz fxmQ== X-Gm-Message-State: AOJu0Yy6pMsQgKiDUpbD7KmFMWP+IxJ/v8TjpEWZK5HNgH+76Bo1lcUz rv9Q0W1VgOsCKLRv8C4MNvE= X-Google-Smtp-Source: AGHT+IGRYtAq4TwY5H3dsPwGGNolueMeCaXJdWH3PfMf5IEVt//eZ9tTfXamA6mgfRz+4xuomI3K3w== X-Received: by 2002:a05:6214:2345:b0:67f:5c0b:568b with SMTP id hu5-20020a056214234500b0067f5c0b568bmr9730940qvb.0.1704785613926; Mon, 08 Jan 2024 23:33:33 -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-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 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; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073332c25adf8efd2d415bba for ; Tue, 09 Jan 2024 08:33:32 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" 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 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=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 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"