1 files changed, 6 insertions, 6 deletions

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index c49c51b7..9f76273f 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -9,9 +9,9 @@ UBOOT_SUFFIX ?= "bin"
 MXSBOOT_NAND_ARGS ?= ""
 
 # U-Boot mxsboot generation for uSD
-do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
+do_image_uboot:mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
                                            u-boot:do_deploy"
-IMAGE_CMD_uboot-mxsboot-sdcard() {
+IMAGE_CMD:uboot-mxsboot-sdcard() {
     mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard
     ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \
@@ -19,9 +19,9 @@ IMAGE_CMD_uboot-mxsboot-sdcard() {
 }
 
 # U-Boot mxsboot generation for NAND
-do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
+do_image_uboot:mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
                                          u-boot:do_deploy"
-IMAGE_CMD_uboot-mxsboot-nand() {
+IMAGE_CMD:uboot-mxsboot-nand() {
     mxsboot ${MXSBOOT_NAND_ARGS} nand \
             ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
             ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand
@@ -33,11 +33,11 @@ IMAGE_CMD_uboot-mxsboot-nand() {
 # image stream built before the wic generation
 do_image_wic[depends] += " \
     ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \
-                                          '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \
+                                          '${IMAGE_BASENAME}:do_image_uboot:mxsboot_sdcard', '', d)} \
 "
 
 # We need to apply a fixup inside of the partition table
-IMAGE_CMD_wic_append_mxs() {
+IMAGE_CMD:wic:append:mxs() {
         # 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${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc