[PATCH 1/4] meta-isar: Switch phyboard-mira to mainline kernel

[Anton Mikanovich <amikan@ilbers.de>]

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 <amikan@ilbers.de>
---
 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 <amikan@ilbers.de>
-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 <amikan@ilbers.de>
----
- 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