diff --git a/conf/layer.conf b/conf/layer.conf
index 4fbf286..5ed3de2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-ofs = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ofs = "6"
 
 LAYERDEPENDS_meta-ofs = "core"
-LAYERSERIES_COMPAT_meta-ofs = "kirkstone"
+LAYERSERIES_COMPAT_meta-ofs = "kirkstone nanbield"
diff --git a/recipes-kernel/intel-fpga-dfl-mod/intel-fpga-dfl-mod_git.bb b/recipes-kernel/intel-fpga-dfl-mod/intel-fpga-dfl-mod_git.bb
new file mode 100644
index 0000000..e6f762b
--- /dev/null
+++ b/recipes-kernel/intel-fpga-dfl-mod/intel-fpga-dfl-mod_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Backport version of the linux-dfl (Device Feature List) kernel driver for FPGA devices"
+DESCRIPTION = "${SUMMARY}"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit module
+
+#SRC_URI = "git://github.com/OFS/linux-dfl-backport;protocol=https;branch=intel/fpga-ofs-dev-6.6-lts"
+SRC_URI = "git://github.com/OFS/linux-dfl-backport;protocol=https;branch=pcolberg/dfhv1"
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+MODULES_INSTALL_TARGET = "install"
+EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR} KERNELBUILDDIR=${STAGING_KERNEL_BUILDDIR}"
+
+# Do not split modules into separate, per-module packages such as
+# kernel-module-fpga-bridge-6.1.55-altera, which will result in
+# build failure due to conflicting .packagedata file entries if
+# the kernel recipe builds the same module packages already.
+KERNEL_SPLIT_MODULES = "0"
+
+# The inherit of module.bbclass will automatically name module packages with
+# "kernel-module-" prefix as required by the oe-core build environment.
+
+RPROVIDES:${PN} += "kernel-module-intel-fpga-dfl"
diff --git a/recipes-kernel/linux/dfl-config.scc b/recipes-kernel/linux/dfl-config.scc
deleted file mode 100644
index 8440eb3..0000000
--- a/recipes-kernel/linux/dfl-config.scc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Include kernel configuration parameters to enable linux-dfl driver
-# https://github.com/OFS/linux-dfl/wiki/Build-the-linux-dfl-kernel#configure-the-kernel
-kconf hardware configs/dfl-config
diff --git a/recipes-kernel/linux/linux-intel-iot-lts-6.1_git.bbappend b/recipes-kernel/linux/linux-intel-iot-lts-6.1_git.bbappend
deleted file mode 100644
index ab9936b..0000000
--- a/recipes-kernel/linux/linux-intel-iot-lts-6.1_git.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-KBRANCH = "fpga-ofs-dev-6.1-lts"
-KERNEL_SRC_URI = "git://github.com/OFS/linux-dfl;protocol=https;branch=${KBRANCH};name=machine"
-SRC_URI = "${KERNEL_SRC_URI}"
-SRCREV_meta = "${AUTOREV}"
-SRCREV_machine = "${AUTOREV}"
-LINUX_VERSION = "6.1"
-LINUX_VERSION_EXTENSION = "-dfl-${@bb.fetch2.get_srcrev(d).split('_')[1]}"
-
-# Allow mismatch between kernel package and source versions,
-# e.g., 5.15+gitAUTOINC+441f5fe000_66b0076c2c versus 5.15.92.
-# The kernel version is not known a priori since the recipe
-# builds the latest commit of the given linux-dfl branch.
-KERNEL_VERSION_SANITY_SKIP = "1"
-
-# Configure Linux FPGA Device Feature List (DFL) driver
-# https://github.com/OFS/linux-dfl/wiki#kernel-configuration
-FILESEXTRAPATHS:append := "${THISDIR}:"
-SRC_URI += "file://dfl-config.scc"