diff --git a/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg b/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg
index ea54003..8d3ad16 100644
--- a/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg
+++ b/meta-raspberrypi/recipes-kernel/linux/files/initramfs-image-bundle.cfg
@@ -1,3 +1,5 @@
 CONFIG_OVERLAY_FS=y
 CONFIG_SQUASHFS=y
+CONFIG_MTD=y
+CONFIG_MTD_UBI=y
 CONFIG_UBIFS_FS=y
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
index 746c0c5..db1dbdb 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
@@ -34,10 +34,3 @@
 # set by default in rpi-4.8.y and later branches so we need to provide it
 # manually. This value unused if KERNEL_IMAGETYPE is not uImage.
 KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000"
-
-do_compile_append() {
-    if [ "${SITEINFO_BITS}" = "64" ]; then
-        cc_extra=$(get_cc_option)
-        oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-    fi
-}