diff --git a/conf/layer.conf b/conf/layer.conf
index 8162281..8c04fb7 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,9 +15,9 @@ BBMASK += "meta-compulab/recipes-kernel"
 BBMASK += "meta-compulab/recipes-graphics"
 BBMASK += ".*boundary.*"
 
-CORE_IMAGE_EXTRA_INSTALL += " kernel-modules kernel linux-compulab-headers "
-CORE_IMAGE_EXTRA_INSTALL += "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'linux-firmware-imx-sdma-imx7d', '', d)}"
-CORE_IMAGE_EXTRA_INSTALL += "${@bb.utils.contains('DISTRO_CODENAME', 'hardknott', 'firmware-imx-sdma-imx7d', 'firmware-imx-sdma', d)}"
+CORE_IMAGE_EXTRA_INSTALL += " kernel-modules kernel linux-compulab-headers firmware-imx-sdma-imx7d"
+#CORE_IMAGE_EXTRA_INSTALL += "${@bb.utils.contains('DISTRO_CODENAME', 'dunfell', 'linux-firmware-imx-sdma-imx7d', '', d)}"
+#CORE_IMAGE_EXTRA_INSTALL += "${@bb.utils.contains('DISTRO_CODENAME', 'hardknott', 'firmware-imx-sdma-imx7d', 'firmware-imx-sdma', d)}"
 
 HOSTTOOLS += " git-lfs "
 HOSTTOOLS += " bison "
diff --git a/recipes-bsp/u-boot/u-boot-compulab-fw-utils.main b/recipes-bsp/u-boot/u-boot-compulab-fw-utils.main
deleted file mode 100644
index df1b3a1..0000000
--- a/recipes-bsp/u-boot/u-boot-compulab-fw-utils.main
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-SECTION = "bootloaders"
-DEPENDS = "flex-native bison-native mtd-utils"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-require u-boot-compulab_${PV}.inc
-
-S = "${WORKDIR}/git"
-
-require u-boot-compulab.inc
-
-INSANE_SKIP_${PN} = "already-stripped"
-EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
-EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
-
-inherit uboot-config
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake envtools
-}
-
-do_install () {
-	install -d ${D}${base_sbindir}
-	install -d ${D}${sysconfdir}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
-}
-
-do_install_class-cross () {
-	install -d ${D}${bindir_cross}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
-}
-
-SYSROOT_DIRS:append_class-cross = " ${bindir_cross}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-BBCLASSEXTEND = "cross"
-
-RDEPENDS_${PN} += "bash"
-
-FILES_${PN} = "/sbin/* /etc/*"
-
-RPROVIDES_${PN} += "u-boot-fw-utils"
-
-require u-boot-fw-utils.inc
diff --git a/recipes-bsp/u-boot/u-boot-fw-utils_2021.04.bb b/recipes-bsp/u-boot/u-boot-fw-utils_2021.04.bb
deleted file mode 100644
index 7e2763a..0000000
--- a/recipes-bsp/u-boot/u-boot-fw-utils_2021.04.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-SECTION = "bootloaders"
-DEPENDS = "flex-native bison-native mtd-utils"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
-SRCBRANCH = "lf_v2021.04"
-SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH} \
-"
-SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd"
-LOCALVERSION ?= "-5.10.35-2.0.0"
-
-S = "${WORKDIR}/git"
-
-require u-boot-compulab.inc
-require u-boot-fw-utils.inc
-
-INSANE_SKIP_${PN} = "already-stripped"
-EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
-EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
-
-inherit uboot-config
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake envtools
-}
-
-do_install () {
-	install -d ${D}${base_sbindir}
-	install -d ${D}${sysconfdir}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
-}
-
-do_install_class-cross () {
-	install -d ${D}${bindir_cross}
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
-}
-
-SYSROOT_DIRS:append_class-cross = " ${bindir_cross}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-BBCLASSEXTEND = "cross"
-
-RDEPENDS_${PN} += "bash"
-
-FILES_${PN} = "/sbin/* /etc/*"
-
-RPROVIDES_${PN} += "u-boot-fw-utils"
diff --git a/recipes-bsp/u-boot/u-boot-imx_%.bbappend b/recipes-bsp/u-boot/u-boot-imx_%.bbappend
deleted file mode 100644
index ec73cf8..0000000
--- a/recipes-bsp/u-boot/u-boot-imx_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-require u-boot-compulab.inc
-require u-boot-compulab-env.inc
-
-do_configure:prepend () {
-	# Merge common defconfig with specific fraggment to get specific defconfig
-	local CONFDIR=configs
-	cd ${S}
-	scripts/kconfig/merge_config.sh  -O ${CONFDIR}/ -m  ${CONFDIR}/cl-imx8m-mini_defconfig ${CONFDIR}/${MACHINE}.config
-	mv ${CONFDIR}/.config ${CONFDIR}/${MACHINE}_defconfig
-	cd -
-}
-