10 files changed, 112 insertions, 114 deletions

diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index db9d9a412..ee938a74d 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -6,25 +6,25 @@
 #
 #  SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true"
 
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8          = "01ba08a2b77c3a0a9d0ab5d4d83fed64"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10         = "3880bb9c943b135a30fad5e8aabd3ee9"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11         = "a31dce3023402a821cfcdc1bb8dbdbc0"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12         = "8cf95184c220e247b9917e7244124c5a"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13         = "102094e9e695888c6a9f9fda9004165d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14         = "d4f548f93b5fe0ee2bc86758c344412d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16         = "be67a88e9e6c841043b005ad7bcf8309"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17         = "88595f92466edd79be7f4f9547ffa0ef"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18         = "6b552f505eedab4a11ab538cf3db743a"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20         = "08fd295cce89b0a9c74b9b83ed74f671"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21         = "6bd2df2910a2234bf6f419b7d2f531a3"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22         = "75abe2fa1d16ca79f87cde926f05f72d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24         = "ab61cab9599935bfe9f700405ef00f28"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26         = "5ab1a30d0cd181e3408077727ea5a2db"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3  = "6dfb32a488e5fd6bae52fbf6c7ebb086"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5  = "80c0478f4339af024519b3723023fe28"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7  = "fb0303e4ee8b0e71c094171e2272bd44"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8  = "72c0f70181bb6e83eee6aab8de12a9f3"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9  = "6c12031a11b81db21cdfe0be88cac4b3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8 = "01ba08a2b77c3a0a9d0ab5d4d83fed64"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10 = "3880bb9c943b135a30fad5e8aabd3ee9"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11 = "a31dce3023402a821cfcdc1bb8dbdbc0"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12 = "8cf95184c220e247b9917e7244124c5a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13 = "102094e9e695888c6a9f9fda9004165d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14 = "d4f548f93b5fe0ee2bc86758c344412d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16 = "be67a88e9e6c841043b005ad7bcf8309"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17 = "88595f92466edd79be7f4f9547ffa0ef"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18 = "6b552f505eedab4a11ab538cf3db743a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20 = "08fd295cce89b0a9c74b9b83ed74f671"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21 = "6bd2df2910a2234bf6f419b7d2f531a3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22 = "75abe2fa1d16ca79f87cde926f05f72d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26 = "5ab1a30d0cd181e3408077727ea5a2db"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3 = "6dfb32a488e5fd6bae52fbf6c7ebb086"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5 = "80c0478f4339af024519b3723023fe28"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7 = "fb0303e4ee8b0e71c094171e2272bd44"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8 = "72c0f70181bb6e83eee6aab8de12a9f3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be88cac4b3"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V13 = "1b4db4b25c3a1e422c0c0ed64feb65d2"
@@ -66,7 +66,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8c
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63 = "bc649096ad3928ec06a8713b8d787eac"
 
-FSL_EULA_FILE_MD5SUMS = " \
+FSL_EULA_FILE_MD5SUMS = "\
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \
     ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11} \
@@ -129,8 +129,7 @@ FSL_EULA_FILE_MD5SUMS = " \
 "
 
 # The checksum for the EULA in the layer
-FSL_EULA_FILE_MD5SUM ?= \
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63}"
+FSL_EULA_FILE_MD5SUM ?= "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63}"
 
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index fae3fe1d9..9b44fe194 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -13,36 +13,35 @@ SCMVERSION ??= "y"
 LOCALVERSION ??= "+fslc"
 
 # LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class
-LINUX_VERSION_EXTENSION ?= \
-    "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
+LINUX_VERSION_EXTENSION ?= "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
 
 do_kernel_localversion[dirs] += "${S} ${B}"
 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
-        fi
+    # 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
+    fi
 
-        if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
+    if [ "${SCMVERSION}" = "y" ]; then
+        # Add GIT revision to the local version
+        if [ "${SRCREV}" = "INVALID" ]; then
+            hash=${SRCREV_machine}
+        else
+            hash=${SRCREV}
+        fi
+        if [ "$hash" = "AUTOINC" ]; then
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+        else
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+        fi
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
 
-                sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
-                echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
-        fi
+        sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
+        echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
+    fi
 }
 
 addtask kernel_localversion before do_configure after do_patch do_kernel_configme
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index df4ac5fbf..c867c9f85 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -15,24 +15,24 @@ LOCALVERSION ??= "+fslc"
 UBOOT_LOCALVERSION = "${LOCALVERSION}"
 
 do_compile:prepend() {
-        if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
-                else
-                        hash=${SRCREV}
-                fi
-                if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
-        else
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
-        fi
+    if [ "${SCMVERSION}" = "y" ]; then
+        # Add GIT revision to the local version
+        if [ "${SRCREV}" = "INVALID" ]; then
+            hash=${SRCREV_machine}
+        else
+            hash=${SRCREV}
+        fi
+        if [ "$hash" = "AUTOINC" ]; then
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+        else
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+        fi
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+    else
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
+    fi
 }
diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass
index d30b47a3b..2c9b44f44 100644
--- a/classes/image_populate_mfgtool.bbclass
+++ b/classes/image_populate_mfgtool.bbclass
@@ -41,8 +41,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-MFGTOOL_FILESPATH ??= " \
-    ${@base_set_filespath(["%s/mfgtool" % p for p in "${BBPATH}".split(":")] \
+MFGTOOL_FILESPATH ??= "\
+    ${@base_set_filespath(["%s/mfgtool"% p for p in "${BBPATH}".split(":")] \
                              + ["${FILE_DIRNAME}/${BP}/mfgtool", \
                                 "${FILE_DIRNAME}/${BPN}/mfgtool", \
                                 "${FILE_DIRNAME}/files/mfgtool"] \
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 63a10f303..65b6a5dbd 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -38,7 +38,7 @@ do_image_wic[depends] += " \
 
 # We need to apply a fixup inside of the partition table
 IMAGE_CMD:wic:append:mxs-generic-bsp() {
-        # Change partition type for mxs processor family
-        bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
-        echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
+    # Change partition type for mxs processor family
+    bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
+    echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
 }
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 5365e5fd7..345f71035 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -32,21 +32,21 @@ ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-o
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 
 IMX_BOOT_CONTAINER_FIRMWARE_SOC ?= ""
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = "\
     signed_dp_imx8m.bin \
     signed_hdmi_imx8m.bin \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = "\
     ${SECO_FIRMWARE_NAME} \
     ${OEI_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE ?= " \
+IMX_BOOT_CONTAINER_FIRMWARE ?= "\
     ${IMX_BOOT_CONTAINER_FIRMWARE_SOC} \
     ${DDR_FIRMWARE_NAME} \
 "
diff --git a/classes/kernel-imximage.bbclass b/classes/kernel-imximage.bbclass
index ccf7ec53b..999840f69 100644
--- a/classes/kernel-imximage.bbclass
+++ b/classes/kernel-imximage.bbclass
@@ -17,44 +17,44 @@
 #
 # Copyright 2017 (C) O.S. Systems Software LTDA.
 
-DEPENDS:append = ' u-boot-mkimage-native'
+DEPENDS:append = " u-boot-mkimage-native"
 
 IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}"
 
 imx_mkimage() {
-        uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
+    uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
 }
 
 gen_imximage() {
-        if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
-                bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
-        fi
+    if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
+        bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
+    fi
 
-        for DTB in ${KERNEL_DEVICETREE}; do
-                DTB=`normalize_dtb "${DTB}"`
-                DTB_EXT=${DTB##*.}
-                DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-                base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
-                symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
-                DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                for DCD in dcd-${DTB}.cfg dcd.cfg; do
-                        if [ -e "${WORKDIR}/${DCD}" ]; then
-                                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
-                                        ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
-                                fi
+    for DTB in ${KERNEL_DEVICETREE}; do
+        DTB=`normalize_dtb "${DTB}"`
+        DTB_EXT=${DTB##*.}
+        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+        base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
+        symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
+        DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        for DCD in dcd-${DTB}.cfg dcd.cfg; do
+            if [ -e "${WORKDIR}/${DCD}" ]; then
+                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
+                    ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
+                fi
 
-                                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
-                                        ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
-                                           ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
-                                fi
-                        fi
-                done
-        done
+                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
+                    ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
+                       ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
+                fi
+            fi
+        done
+    done
 }
 
 do_deploy:append() {
-        gen_imximage
+    gen_imximage
 }
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index f338bf829..38a607778 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -19,12 +19,12 @@ IMAGE_ROOTFS_SIZE ?= "8192"
 IMAGE_NAME_SUFFIX = ""
 
 # Filesystems enabled by default
-DEFAULT_FS_SUPPORT = " \
+DEFAULT_FS_SUPPORT = "\
     mtd \
     extfs \
 "
 
-IMAGE_FEATURES = " \
+IMAGE_FEATURES = "\
     ${DEFAULT_FS_SUPPORT} \
     \
     read-only-rootfs \
@@ -38,6 +38,6 @@ USE_DEVFS = "1"
 
 inherit core-image
 
-CORE_IMAGE_BASE_INSTALL = " \
+CORE_IMAGE_BASE_INSTALL = "\
     ${CORE_IMAGE_EXTRA_INSTALL} \
 "
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 975dd77c1..6a39bb684 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -16,15 +16,15 @@
 # This behavior ensures that derivatives which requires SECO Firmware to be
 # present in the image file have it properly defined.
 
-SECO_FIRMWARE_NAME                    ?= ""
-SECO_FIRMWARE_NAME:mx8qm-generic-bsp  ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME ?= ""
+SECO_FIRMWARE_NAME:mx8qm-generic-bsp ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dx-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx91-generic-bsp   ?= "mx91${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx91-generic-bsp ?= "mx91${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx93-generic-bsp ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx95-generic-bsp ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
 
 python () {
     if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass
index b41d22a92..54d9c1902 100644
--- a/classes/uuu_bootloader_tag.bbclass
+++ b/classes/uuu_bootloader_tag.bbclass
@@ -5,7 +5,7 @@
 # IMPORTANT: The tagged boot partition file should never be used directly with
 #            UUU, as it can cause UUU to hang.
 
-UUU_BOOTLOADER                 = "${UBOOT_BINARY}"
+UUU_BOOTLOADER = "${UBOOT_BINARY}"
 UUU_BOOTLOADER:mx8-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"
 UUU_BOOTLOADER:mx9-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"