1 files changed, 3 insertions, 3 deletions

diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 9acce846..a3e1972e 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -22,11 +22,11 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \
            "
 
 # include the user space intel microcode loading support in the generated images.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " intel-microcode iucode-tool"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}"
 
-# For the early boot time kernel microcode loading support,
+# for the early boot time kernel microcode loading support,
 # merge the microcode data in the final initrd image.
-INITRD_prepend = "${DEPLOY_DIR_IMAGE}/microcode.cpio "
+INITRD_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
 
 # Use the LTSI kernel for LSB images
 PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "3.10%"