From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440801196408832 X-Received: by 2002:a05:6e02:12c4:b0:35f:ed6e:3104 with SMTP id i4-20020a056e0212c400b0035fed6e3104mr7150304ilm.63.1704785615123; Mon, 08 Jan 2024 23:33:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:c5c3:0:b0:360:c64:4fc6 with SMTP id s3-20020a92c5c3000000b003600c644fc6ls1352974ilt.1.-pod-prod-05-us; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGp2D0GExu+6F6WJfI6RU9HVsxmdJl4B5Mpt98R4dd4dgN9KXlNaXw4ZKWboLZ2WZ7/v8fp X-Received: by 2002:a05:6e02:1bc5:b0:35f:f383:ac7b with SMTP id x5-20020a056e021bc500b0035ff383ac7bmr8428181ilv.16.1704785614025; Mon, 08 Jan 2024 23:33:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785614; cv=none; d=google.com; s=arc-20160816; b=Fe7/AUt35WSzBgfVEnaI9ZcgjU8pifwhbLq1e8J5vDmAJRRy3ZQKalkQUic3rUn+s1 K9o51CTQbs3wNH3b+7CcS+mLO2LJqswXVNWPMJibW6waaUD/7IO2NnjvZpLrz42Sk6xy tPrZ/tjuuLxBE7CRGXpC5MzdCuyTh2D8suRnZmT4AMeGJk6oY/NMdZhgjzshfVdstRUy 3NJ58V4eJ1ADGH4hwRmbtxhAOMNVxzRU1naUPdjG0KZ0vEgYoWHqQqRmDNjOxd1Vn/v8 KLWxRkG0BWUdSWV1p/kc4xZ9bzANvm4vixnf5WRWKdtpfC9lqHzy+tkhte0k1PdkzPKR ttAw== 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=QLDzSRU7epyJSqkR1ZaJj9fmB5ysacDIUPIRRVsRy/c=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=pxEismD816VRjuGTPmegc6sls/qk4TZtI5CLPivMo2AM4HHHxwlKoDv8nsNGLDARVs rmPnU6v6LBHqRw9xIh6wdMXV/T869W17aE/SNv4d5++somC/Wu0KNU1RJC3wWJpzD6dT e31BDBur2qk6kZaBho2h9wo1kh69gK9yaG36r5jQC61825GWXxWlH1beFOQgPqnxDlX4 N44V0Ru8Q7CaQ2k7WpBq3sNxf7a1EuKpSIQjklSbPe4jG5aDVnaRYOoKEJR6kla5sC5B YgpWc/JCikk4tmSmOJx7kqNYbCibMVBGgW3MISActThnFOUnRklVdzJHTuqXHsyt1Ztw Z8SQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="GS2Ic8P/"; spf=pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073333e180ed9e89dc156de4-TVRaan@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id v11-20020a02384b000000b0046df403db86si77634jae.7.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:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="GS2Ic8P/"; spf=pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073333e180ed9e89dc156de4-TVRaan@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20240109073333e180ed9e89dc156de4 for ; Tue, 09 Jan 2024 08:33:33 +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=QLDzSRU7epyJSqkR1ZaJj9fmB5ysacDIUPIRRVsRy/c=; b=GS2Ic8P/BtjFZ7LE/z1nHuUynX88rVp4jTuqZCxs1YikPntRsEpcpOWOj4aXUC09jD9Rot uigHFOrG4bo6Sbs40umHfIdAjGh1lb3KK1PN9iLIWQQa05IP0j8JxuQtln66FvjXQ+lpVish 93bK9LINbu64NarARUenhsCeDWdiI=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 8/8] meta-isar: Switch VisionFive 2 to mainline kernel Date: Tue, 9 Jan 2024 08:33:24 +0100 Message-Id: <894e1bfc61dcda239d38cf9ca64442cd55fe916b.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: hCZhrPvLmT9E 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.10.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.10.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb index 059b8534..649e1e86 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.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] = "9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c" 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