From 855918bbf2cad9d0f46304bbdaea7da71e9b2222 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 27 Feb 2014 17:59:23 -0300 Subject: image_types_fsl.bbclass: Fix imx-bootlets build with new image code Since the image_types.bbclass is not cd'ing to ${DEPLOY_DIR_IMAGE} anymore, the imx-bootlets code need to be reworked to take this into account. Change-Id: Ic7890557e93b47997590143047816ecb0378ad13 Signed-off-by: Otavio Salvador Reviewed-by: Alexandre Belloni --- classes/image_types_fsl.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index f0160df..47e8338 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass @@ -15,8 +15,8 @@ UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" IMAGE_DEPENDS_linux.sb = "elftosb-native imx-bootlets virtual/kernel" IMAGE_LINK_NAME_linux.sb = "" IMAGE_CMD_linux.sb () { - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_dtb="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" + kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" + kernel_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" linux_bd_file=imx-bootlets-linux.bd-${MACHINE} if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then # When using device tree we build a zImage with the dtb @@ -24,16 +24,16 @@ IMAGE_CMD_linux.sb () { linux_bd_file=imx-bootlets-linux.bd-dtb-${MACHINE} cat $kernel_bin $kernel_dtb \ > $kernel_bin-dtb - rm -f ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb - ln -s $kernel_bin-dtb ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb + rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb + ln -s $kernel_bin-dtb ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb fi # Ensure the file is generated - rm -f ${IMAGE_NAME}.linux.sb - elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb + (cd ${DEPLOY_DIR_IMAGE}; elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb) # Remove the appended file as it is only used here - rm -f $kernel_bin-dtb + rm -f ${DEPLOY_DIR_IMAGE}/$kernel_bin-dtb } # IMX Bootlets barebox bootstream -- cgit v1.2.3-54-g00ecf