From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7384456417236746240 X-Received: by 2002:a05:6512:10d3:b0:52c:d7cf:dec with SMTP id 2adb3069b0e04-52ce185ce19mr6708977e87.58.1719327743300; Tue, 25 Jun 2024 08:02:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5232:0:b0:52c:a25e:f9d2 with SMTP id 2adb3069b0e04-52ccf09edafls2341917e87.2.-pod-prod-05-eu; Tue, 25 Jun 2024 08:02:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt4DRQIECQZZHUFlJvImsXFl1IDXQrWB2nZNOIwh8LMbp9FAF5h49IsqaXYqPRVCrJcLNV X-Received: by 2002:ac2:58f5:0:b0:52c:a5cc:27e7 with SMTP id 2adb3069b0e04-52ce185d097mr5271546e87.66.1719327740051; Tue, 25 Jun 2024 08:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719327740; cv=none; d=google.com; s=arc-20160816; b=O3aEvaL+LXXbMDpwufZaKDUeOTTYISZhTXsI1TBtVQ14/8gjzIGEwZqYB/KWaQuVGr LatgHfSwngbfmQtmvRhp7O85ToneYayJyB+qlxRqUnnU9Bmit2H+u8UcGtGYOKuyIGCy raEwSvuhtoxrtiXUN/YbGHq0xCoy7wryCaO+bHKD8UJiz42t8unj9VeJweqxWsZVnfQJ g327b1rlYL5eaJqfrx1qUSRWx3k/SyrlUuHoqOZUYuIp32OYfjjHruvbSdZjPVcJkK5O gXMq2Fn7TLfm83prBh8f9ts47QafHyjXuqdxrCcKrfU8RkLX7+xeFOHqiu/a5V7NPHPW saWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=kKS1i2m/2dxQT8B4/0jNBkdN/9LWNk7z6AIReq737qE=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=IOAzM9QDFZZYL0Cfjpx72Olr4KMiPFxXdm21DvVtnWOCaA8oRSNrGcUlsZ0mPejfWb iouOwmS8UcZ5YYZRxZSSPUzrn/oCFmImM/gYFakRolR3az0W6eRNosm5vWAcmCmvhPx2 yoApgQYq4XP7bcqpjBBE0i86r1+v9Itz6TWsa3Jfg9Y16T3p9XYi066iH5tzdbZX6GlH ASWGWdX5EeSmo3g+8ilAWEFKM+f3sPaTRQy0b5lzOUW5697iNKpo43kVsU1PHbeicUtI 2xjuAVqD5OfOZoxCrW3ay8/nEiccsD8juRaeJCfOF+u0QsGczWcHUry9AI5AOO0LRjD5 Dazg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-52cd63bdbfesi193149e87.4.2024.06.25.08.02.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jun 2024 08:02:19 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45PF2HKP026036 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jun 2024 17:02:18 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 1/4] meta-isar: Switch phyboard-mira to mainline kernel Date: Tue, 25 Jun 2024 18:02:07 +0300 Message-Id: <20240625150210.417117-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240625150210.417117-1-amikan@ilbers.de> References: <20240625150210.417117-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: w1+31PhiiIOK As the board is already supported by currently available 6.6.11 kernel. Config fragment verification was moved to the separate function check_fragments_applied() so it can be omitted. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/phyboard-mira.conf | 2 +- ...bsinstall-fix-installing-DT-overlays.patch | 30 ------------------- .../linux/linux-mainline_6.6.11.bb | 8 +++-- .../linux/linux-phy_5.10.76-phy4.bb | 16 ---------- .../recipes-kernel/linux/linux-phy_6.6.11.bb | 14 +++++++++ 5 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 meta-isar/recipes-kernel/linux/files/0001-dtbsinstall-fix-installing-DT-overlays.patch delete mode 100644 meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb create mode 100644 meta-isar/recipes-kernel/linux/linux-phy_6.6.11.bb diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 0bc60cb0..feec4e54 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -16,7 +16,7 @@ MKUBIFS_ARGS := "-m 0x800 -e 0x1f000 -c 8012" UBINIZE_ARGS = "-vv -m 0x800 -p 0x20000" IMAGE_FSTYPES ?= "ubi ubifs" -DTB_FILES = "imx6q-phytec-mira-ff-rdk-nand.dtb" +DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb" IMAGE_INSTALL += "barebox" diff --git a/meta-isar/recipes-kernel/linux/files/0001-dtbsinstall-fix-installing-DT-overlays.patch b/meta-isar/recipes-kernel/linux/files/0001-dtbsinstall-fix-installing-DT-overlays.patch deleted file mode 100644 index 0865870d..00000000 --- a/meta-isar/recipes-kernel/linux/files/0001-dtbsinstall-fix-installing-DT-overlays.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 74c2d5edf5d9d601b1caac0cae8be785e45e9af0 Mon Sep 17 00:00:00 2001 -From: Anton Mikanovich -Date: Tue, 8 Feb 2022 19:47:35 +0300 -Subject: [PATCH] dtbsinstall: fix installing DT overlays - -Add dtbo target needed for __dtbs_install to fix 'make dtbs_install' -call. 'No rule to make target' error will occur otherwise. - -Signed-off-by: Anton Mikanovich ---- - scripts/Makefile.dtbinst | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 50d580d77ae9..829609ce29cf 100644 ---- a/scripts/Makefile.dtbinst -+++ b/scripts/Makefile.dtbinst -@@ -29,6 +29,9 @@ quiet_cmd_dtb_install = INSTALL $@ - $(dst)/%.dtb: $(obj)/%.dtb - $(call cmd,dtb_install) - -+$(dst)/%.dtbo: $(obj)/%.dtbo -+ $(call cmd,dtb_install) -+ - PHONY += $(subdirs) - $(subdirs): - $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@) --- -2.25.1 - diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.11.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.11.bb index d7483eb0..2287e763 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.11.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.11.bb @@ -24,8 +24,7 @@ KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" LINUX_VERSION_EXTENSION = "-isar" -# For testing purposes only -dpkg_configure_kernel:append() { +check_fragments_applied() { grep -q "# CONFIG_MTD is not set" ${S}/debian/rules || cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules if ! grep "# CONFIG_MTD is not set" \$(O)/.config && \\ @@ -37,3 +36,8 @@ dpkg_configure_kernel:append() { (echo "Self-check failed: CONFIG_ROOT_NFS not enabled" && exit 1) EOF } + +# For testing purposes only +dpkg_configure_kernel:append() { + check_fragments_applied +} diff --git a/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb b/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb deleted file mode 100644 index accb3c9a..00000000 --- a/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb +++ /dev/null @@ -1,16 +0,0 @@ -require recipes-kernel/linux/linux-custom.inc - -SRC_URI += "https://git.phytec.de/linux-mainline/snapshot/linux-mainline-${PV}.tar.bz2 \ - file://0001-dtbsinstall-fix-installing-DT-overlays.patch" - -SRC_URI[sha256sum] = "ce0cff708da9f3dca1f6f8d6c433589fd5a5ea8db9e33114f44497ecf873f875" - -S = "${WORKDIR}/linux-mainline-${PV}" - -KBUILD_DEPENDS:append = "lzop" - -KERNEL_DEFCONFIG = "imx_v6_v7_defconfig" - -LINUX_VERSION_EXTENSION = "-isar" - -COMPATIBLE_MACHINE = "phyboard-mira" diff --git a/meta-isar/recipes-kernel/linux/linux-phy_6.6.11.bb b/meta-isar/recipes-kernel/linux/linux-phy_6.6.11.bb new file mode 100644 index 00000000..25864d1c --- /dev/null +++ b/meta-isar/recipes-kernel/linux/linux-phy_6.6.11.bb @@ -0,0 +1,14 @@ +require recipes-kernel/linux/linux-mainline_6.6.11.bb + +SRC_URI:remove = "file://ftpm-module.cfg" +SRC_URI:remove = "file://subdir/no-ubifs-fs.cfg" + +check_fragments_applied() { + echo "Kernel config fragments checking disabled" +} + +KERNEL_DEFCONFIG = "imx_v6_v7_defconfig" + +LINUX_VERSION_EXTENSION = "-isar" + +COMPATIBLE_MACHINE = "phyboard-mira" -- 2.34.1