1 files changed, 2 insertions, 66 deletions

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index e7627200..e49bb1af 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -11,20 +11,6 @@ UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}"
 #
 MXSBOOT_NAND_ARGS ?= ""
 
-# IMX Bootlets barebox bootstream
-do_image_barebox-mxsboot-sdcard[depends] += "elftosb-native:do_populate_sysroot \
-                                             u-boot-mxsboot-native:do_populate_sysroot \
-                                             imx-bootlets:do_deploy \
-                                             barebox:do_deploy"
-IMAGE_CMD_barebox-mxsboot-sdcard () {
-        barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE}
-
-        # Ensure the files are generated
-        (cd ${DEPLOY_DIR_IMAGE}; rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox-mxsboot-sdcard; \
-         elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb; \
-         mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox-mxsboot-sdcard)
-}
-
 # U-Boot mxsboot generation to SD-Card
 UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard"
 do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
@@ -44,9 +30,6 @@ BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}"
 # Boot partition size [in KiB]
 BOOT_SPACE ?= "8192"
 
-# Barebox environment size [in KiB]
-BAREBOX_ENV_SPACE ?= "512"
-
 # Set alignment to 4MB [in KiB]
 IMAGE_ROOTFS_ALIGNMENT = "4096"
 
@@ -125,7 +108,7 @@ _generate_boot_image() {
 #
 # External variables needed:
 #   ${SDCARD_ROOTFS}    - the rootfs image to incorporate
-#   ${IMAGE_BOOTLOADER} - bootloader to use {u-boot, barebox}
+#   ${IMAGE_BOOTLOADER} - bootloader to use
 #
 # The disk layout used is:
 #
@@ -153,10 +136,6 @@ generate_imx_sdcard () {
 
         # Burn bootloader
         case "${IMAGE_BOOTLOADER}" in
-                imx-bootlets)
-                bberror "The imx-bootlets is not supported for i.MX based machines"
-                exit 1
-                ;;
                 u-boot)
                 if [ -n "${SPL_BINARY}" ]; then
                         dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=2 bs=512
@@ -165,12 +144,6 @@ generate_imx_sdcard () {
                         dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 bs=512
                 fi
                 ;;
-                barebox)
-                dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512
-                dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 bs=512k
-                ;;
-                "")
-                ;;
                 *)
                 bberror "Unknown IMAGE_BOOTLOADER value"
                 exit 1
@@ -190,40 +163,13 @@ generate_imx_sdcard () {
 #
 # External variables needed:
 #   ${SDCARD_ROOTFS}    - the rootfs image to incorporate
-#   ${IMAGE_BOOTLOADER} - bootloader to use {imx-bootlets, u-boot}
+#   ${IMAGE_BOOTLOADER} - bootloader to use
 #
 generate_mxs_sdcard () {
         # Create partition table
         parted -s ${SDCARD} mklabel msdos
 
         case "${IMAGE_BOOTLOADER}" in
-                imx-bootlets)
-                # The disk layout used is:
-                #
-                #    0                      -> 1024                           - Unused (not partitioned)
-                #    1024                   -> BOOT_SPACE                     - kernel and other data (bootstream)
-                #    BOOT_SPACE             -> SDIMG_SIZE                     - rootfs
-                #
-                #                                     Default Free space = 1.3x
-                #                                     Use IMAGE_OVERHEAD_FACTOR to add more space
-                #                                     <--------->
-                #    1024        8MiB          SDIMG_ROOTFS                    4MiB
-                # <-------> <----------> <----------------------> <------------------------------>
-                #  --------------------- ------------------------ -------------------------------
-                # | Unused | BOOT_SPACE | ROOTFS_SIZE            |     IMAGE_ROOTFS_ALIGNMENT    |
-                #  --------------------- ------------------------ -------------------------------
-                # ^        ^            ^                        ^                               ^
-                # |        |            |                        |                               |
-                # 0      1024      1024 + 8MiB       1024 + 8Mib + SDIMG_ROOTFS      1024 + 8MiB + SDIMG_ROOTFS + 4MiB
-                parted -s ${SDCARD} unit KiB mkpart primary 1024 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
-                parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
-
-                # Empty 4 blocks from boot partition
-                dd if=/dev/zero of=${SDCARD} conv=notrunc seek=2048 count=4
-
-                # Write the bootstream in (2048 + 4) blocks
-                dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb of=${SDCARD} conv=notrunc seek=2052
-                ;;
                 u-boot)
                 # The disk layout used is:
                 #
@@ -259,15 +205,6 @@ generate_mxs_sdcard () {
 
                 dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=2 bs=$(expr 1024 \* 1024)
                 ;;
-                barebox)
-                # BAREBOX_ENV_SPACE is taken on BOOT_SPACE_ALIGNED but it doesn't really matter as long as the rootfs is aligned
-                parted -s ${SDCARD} unit KiB mkpart primary 1024 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE})
-                parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
-                parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
-
-                dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.barebox-mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024)
-                dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE}) bs=1024
-                ;;
                 *)
                 bberror "Unknown IMAGE_BOOTLOADER value"
                 exit 1
@@ -310,7 +247,6 @@ IMAGE_TYPEDEP_sdcard_append = " ${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}"
 # image stream built before the sdcard generation
 IMAGE_TYPEDEP_sdcard_append = " \
     ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', 'uboot-mxsboot-sdcard', '', d)} \
-    ${@bb.utils.contains('IMAGE_FSTYPES', 'barebox-mxsboot-sdcard', 'barebox-mxsboot-sdcard', '', d)} \
 "
 
 # In case we are building for i.MX23 or i.MX28 we need to have the