From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440801196408832 X-Received: by 2002:a05:6214:18e5:b0:680:815a:44d8 with SMTP id ep5-20020a05621418e500b00680815a44d8mr7556452qvb.130.1704190114686; Tue, 02 Jan 2024 02:08:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5c65:0:b0:67f:744d:8b3e with SMTP id i5-20020ad45c65000000b0067f744d8b3els2136396qvh.1.-pod-prod-03-us; Tue, 02 Jan 2024 02:08:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKJVg0xZuODCeCSM0y4/3ynGz4mKVLwgpt/4FtM6O9JeI1bcBuNFzx3YG42LcQqhfgfXsm X-Received: by 2002:a05:6122:3a0b:b0:4b7:5f3d:c8e2 with SMTP id fp11-20020a0561223a0b00b004b75f3dc8e2mr1888429vkb.33.1704190113696; Tue, 02 Jan 2024 02:08:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704190113; cv=none; d=google.com; s=arc-20160816; b=duZ9knjdPcfkG3aUWlnhE5mVVBK1DrU2ZErynheAlumkiVJDxhraify/4qBZUHwANI yeqgyvtK7LcX8cT9CopxaVaZO3GxwE6mOjj4qK0w2GAHq/wBm3lh2dZfRDalLsopEIn2 uoN/JNH0IWUz03OmVcNJn9ZrY7lQwRvtVr6kGiurIb/8GFwdY04lrpGLQD0xiMjWjN1W sDoLzjjBOJ1gr3AVd25GoX+XdvuvKZEPU59qB7SCo1g3IrpH6gGyy2O9TKLnTNajI1Q2 R1DZ/vnOk4p1V0+a/Idy/VcwaZTDNRgxnaEJJT6jxzRAjZ0bJArXtGTOKfeu9X2c3TM3 j9yQ== 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=vC9YJQ3ptA5kYpDO+RFCg9PdpLm7HplCpV4fBMoWaRM=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=M/WRfnpH47N1AdbXKAWHSkbcwSFWr/2EG0oiysXcawQSUsu5Hy9R6mLlL8pTb/Dl6O 8yeuNqpISj4V0Oh2AHnqrynqUQujE32bIVjsxUSxnqIdQOEzyDKNL7yT82UqwR2Mcp7v i16zQ/XgXLBdYHzopzw455pFRS/21sVElJVV158suPqGlviFAzWJAdEydRL/+OfZ8uQ1 ev+gK5/E8IFnfr0Vmluis9qJd+pYq1dvZ2PBIiRnqhu0VWC4KSszqXFqdQEy+Tv7pjkn Xtksux9+jaMOxD5j5wut5/qRTo+5Wl4ACYCmTH9X4Ws8wgWwb+fkX7VSQnByuuBnygeV vv0Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Q2sE9cgQ; spf=pass (google.com: domain of fm-294854-20240102100832250861f016704ce483-tss_ix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240102100832250861f016704ce483-TSS_Ix@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id q6-20020a056122116600b004b71e52abc3si2277312vko.4.2024.01.02.02.08.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2024 02:08:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240102100832250861f016704ce483-tss_ix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Q2sE9cgQ; spf=pass (google.com: domain of fm-294854-20240102100832250861f016704ce483-tss_ix@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240102100832250861f016704ce483-TSS_Ix@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240102100832250861f016704ce483 for ; Tue, 02 Jan 2024 11:08: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=vC9YJQ3ptA5kYpDO+RFCg9PdpLm7HplCpV4fBMoWaRM=; b=Q2sE9cgQXPABynzdmalsLitqcXbXBeYYgGRysSmz4p0boQxlyvuGTqB+5WuF7kfpjJJYjq WALR+K1TMYRxra0YRmww9NfmXcR1ZKhJx/loRlYlOu3H/psK89HfS5gOf/3f+snBeuZocvH/ C9pcc4PXPyWGK2Tsh3Chq5naELbuk=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH 9/9] meta-isar: Switch VisionFive 2 to mainline kernel Date: Tue, 2 Jan 2024 11:08:29 +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: l35/N8FeMuR8 From: Jan Kiszka Using 6.6 as baseline means dropping support for PCIe (M.2), timer (alternative clocksource), PWM, CAN, PWMDAC, Display, ISP (camera). We still get a connected and generally working board this way, and we no longer need to maintain a separate recipe. Also the example-module now builds fine. As mainline is fine with the DT provided by mainline U-Boot, stop using the kernel's DT. Signed-off-by: Jan Kiszka --- .../conf/machine/starfive-visionfive2.conf | 6 +----- .../linux/files/starfive2_extra.cfg | 6 +++--- .../linux/linux-mainline_6.6.9.bb | 2 ++ .../linux/linux-starfive_5.15-visionfive2.bb | 19 ------------------- .../canned-wks/starfive-visionfive2.wks.in | 2 +- 5 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index c7f72bb3..baae7ed8 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -5,7 +5,7 @@ DISTRO_ARCH = "riscv64" -KERNEL_NAME ?= "starfive" +KERNEL_NAME ?= "mainline" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "starfive-visionfive2.wks.in" @@ -13,7 +13,3 @@ IMAGER_INSTALL:wic += " \ u-boot-starfive-visionfive2 \ ${SYSTEMD_BOOTLOADER_INSTALL}" IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" - -# DTB file for booting -DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" -DTB_FILES = "starfive/${DTB_VISIONFIVE2}" diff --git a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg index d11c28de..d7c42d73 100644 --- a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg @@ -1,3 +1,3 @@ -# additional configuration to support stock debian userlands -CONFIG_BINFMT_MISC=y -CONFIG_SQUASHFS=m +# still needed in 6.6, see commit 07863871dfb162965b21bb8c2e4861bdb0019da3 +CONFIG_MMC_DW=y +CONFIG_MMC_DW_STARFIVE=y diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.9.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.9.bb index c8c5d55f..ee2352de 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.9.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.9.bb @@ -16,6 +16,8 @@ SRC_URI += " \ file://subdir/no-ubifs-fs.cfg \ file://no-root-nfs.cfg;apply=no" +SRC_URI:append:riscv64 = " file://starfive2_extra.cfg" + SRC_URI[sha256sum] = "8ebc65af0cfc891ba63dce0546583da728434db0f5f6a54d979f25ec47f548b3" S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb deleted file mode 100644 index e9e0bf4a..00000000 --- a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -require recipes-kernel/linux/linux-custom.inc - -SRC_URI += " \ - git://github.com/starfive-tech/linux.git;protocol=https;branch=JH7110_VisionFive2_devel;destsuffix=linux-visionfive-${PV} \ - file://starfive2_extra.cfg" -SRCREV = "a87c6861c6d96621026ee53b94f081a1a00a4cc7" - -S = "${WORKDIR}/linux-visionfive-${PV}" - -KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" - -LINUX_VERSION_EXTENSION = "-isar" - -COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in index ed8a3b71..2600580a 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/ # U-Boot FIT part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot.itb" --fixed-size 4M --part-type BC13C2FF-59E6-4262-A352-B275FD6F7172 # EFI -part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024 +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024 # rootfs part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ -- 2.35.3