@@ -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"
deleted file mode 100644
@@ -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
-
@@ -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
+}
deleted file mode 100644
@@ -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"
new file mode 100644
@@ -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"
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 <amikan@ilbers.de> --- 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