diff --git a/meta-digi-arm/recipes-core/udev/udev-rules-imx.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend
similarity index 100%
rename from meta-digi-arm/recipes-core/udev/udev-rules-imx.bbappend
rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx.bbappend
diff --git a/meta-digi-arm/recipes-core/udev/udev-rules-imx/10-imx.rules b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx/10-imx.rules
similarity index 100%
rename from meta-digi-arm/recipes-core/udev/udev-rules-imx/10-imx.rules
rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-core/udev/udev-rules-imx/10-imx.rules
diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf/imx/blacklist.conf b/meta-digi-arm/recipes-core/udev/udev-extraconf/blacklist.conf
similarity index 100%
rename from meta-digi-arm/recipes-core/udev/udev-extraconf/imx/blacklist.conf
rename to meta-digi-arm/recipes-core/udev/udev-extraconf/blacklist.conf
diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
index 954031296..55d58faf2 100644
--- a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
+++ b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018 Digi International.
+# Copyright (C) 2013-2022 Digi International.
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
@@ -37,7 +37,10 @@ do_install_append() {
 	fi
 
 	install -d ${D}${sysconfdir}/modprobe.d
-	install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d
+	if ${@bb.utils.contains('MACHINE_FEATURES','gpu','false','true',d)}; then
+		# evbug debug tool
+		install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d
+	fi
 }
 
 FILES_${PN}_append = " ${sysconfdir}/modprobe.d"