From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7379892825247186944 X-Received: by 2002:a50:9f8c:0:b0:57c:71ca:f651 with SMTP id 4fb4d7f45d1cf-57caaacbd63mr3399428a12.20.1718265197622; Thu, 13 Jun 2024 00:53:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:35c3:b0:57c:a828:752d with SMTP id 4fb4d7f45d1cf-57cb4b67c2cls113267a12.2.-pod-prod-05-eu; Thu, 13 Jun 2024 00:53:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKHWlz2EFtPbFxv4rc5t4VnowCLUZwIOvtf+uO57b1wJJ0fceEPFQAOuFXODbeREXKyzZv X-Received: by 2002:a50:aad6:0:b0:57c:a7fe:b155 with SMTP id 4fb4d7f45d1cf-57caaabd17bmr3413930a12.15.1718265195498; Thu, 13 Jun 2024 00:53:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718265195; cv=none; d=google.com; s=arc-20160816; b=LVQqTcDzUSS44M/R4FyziDRtSIorsukbXa8dkmQg5VgDFngyJRg4nkACXFYdEbr6xh tOAufE1KgmrKeoVfUwqbMj2C6C2vd+E4KBLPm3OicOY3yho1tYsTPpQonW+5IliYXUFi jZBpT2y4exCZD084LlzVf6o2FbL488ZS3N14AQt6Vhks/CFOonIth2/wMq46+2KPkS0k 3bAhp74wmC3pOEZMF3uXiZ81QPMPKIEurAGWSYWjSnN4S3Wul+7iKpiJ1C1MPIUxNiai E6BadV3kmWvKIF53LssJhTJZV1DYhNYIyqilYSbRs7zAvxJTlU2IjXgFPlCk8dqO3rBU Ya+w== 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=8r7r0XgGPqsnMbT5YoTOiZ0YwOvEXwNm/J5qfxgyNkc=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=1GfmQInL9nt1qIG1OSsX0cjR0DQnDG4ZlsVEoIFdxDvVgCkUJRAcax24Q+Rzjywogq lNN90vQnNLJTSW3lKcJe3//AhVIxMZg+f5meO9a+i2EHsP10AEb5/RzNo9dIb16oVlSR QkSFSGs/j7VFx9NlN3EI2rhfYQYMBGU11riYs7gmBC10g2Mz+69mMU744if1oxlt8/3N WTyAxewiTN6Vr19i1mSeSm4lABL48BJuuI9GTRqYjjvRhQPT8aIOR6s0iV4NZyCv0zjR WF1nuzL07XmJqnYaySiOh/+T+dPTwH20mp01ls0hAhdzZPtW4jgUjklHcyOn9RefI98e 32MA==; 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 4fb4d7f45d1cf-57cb743880asi15397a12.3.2024.06.13.00.53.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Jun 2024 00:53:15 -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 localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45D7rCiO024948 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 09:53:14 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/4] meta-isar: Switch phyboard-mira to mainline kernel Date: Thu, 13 Jun 2024 10:53:02 +0300 Message-Id: <20240613075305.91864-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613075305.91864-1-amikan@ilbers.de> References: <20240613075305.91864-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: WzO89aBOBOsF As the board is already supported by currently available 6.6.11 kernel. Add some additional logic to keep ubifs support for the target. Recipe linux-phy is no more used and removed. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/phyboard-mira.conf | 4 +-- ...bsinstall-fix-installing-DT-overlays.patch | 30 ------------------- .../linux/linux-mainline_6.6.11.bb | 7 +++++ .../linux/linux-phy_5.10.76-phy4.bb | 16 ---------- 4 files changed, 9 insertions(+), 48 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 diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 0bc60cb0..1c406069 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf" -KERNEL_NAME ?= "phy" +KERNEL_NAME ?= "mainline" MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" @@ -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..b8a64dbe 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 @@ -16,11 +16,17 @@ SRC_URI += " \ file://subdir/no-ubifs-fs.cfg \ file://no-root-nfs.cfg;apply=no" +SRC_URI:remove:phyboard-mira = "file://ftpm-module.cfg" +SRC_URI:remove:phyboard-mira = "file://subdir/no-ubifs-fs.cfg" + +UBIFS_NEEDED:phyboard-mira = "1" + SRC_URI[sha256sum] = "afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52" S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" +KERNEL_DEFCONFIG:phyboard-mira = "imx_v6_v7_defconfig" LINUX_VERSION_EXTENSION = "-isar" @@ -29,6 +35,7 @@ dpkg_configure_kernel:append() { 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 && \\ + ! [ "${UBIFS_NEEDED}" = "1" ] && \\ ! grep "# CONFIG_MTD_UBI is not set" \$(O)/.config; then \\ grep "# CONFIG_UBIFS_FS is not set" \$(O)/.config || \\ (echo "Self-check failed: CONFIG_UBIFS_FS still enabled" && exit 1); \\ 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" -- 2.34.1