2 files changed, 2 insertions, 1 deletions

diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index d4322e25f..98fcfa056 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -20,7 +20,7 @@ do_kernel_localversion() {
 
         # Fallback for recipes not able to use LINUX_VERSION_EXTENSION
         if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then
-                echo "CONFIG_LOCALVERSION=${LOCALVERSION}" >> ${B}/.config
+                echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >> ${B}/.config
         fi
 
         if [ "${SCMVERSION}" = "y" ]; then
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index 185863ce1..f338bf829 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -16,6 +16,7 @@ ZSTD_COMPRESSION_LEVEL ?= "-10"
 SOC_DEFAULT_IMAGE_FSTYPES = "cpio.zst.u-boot"
 SOC_DEFAULT_IMAGE_FSTYPES:mxs-generic-bsp = "cpio.gz.u-boot"
 IMAGE_ROOTFS_SIZE ?= "8192"
+IMAGE_NAME_SUFFIX = ""
 
 # Filesystems enabled by default
 DEFAULT_FS_SUPPORT = " \