diff options
Diffstat (limited to 'classes/image_types_fsl.bbclass')
-rw-r--r-- | classes/image_types_fsl.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
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}" | |||
15 | IMAGE_DEPENDS_linux.sb = "elftosb-native imx-bootlets virtual/kernel" | 15 | IMAGE_DEPENDS_linux.sb = "elftosb-native imx-bootlets virtual/kernel" |
16 | IMAGE_LINK_NAME_linux.sb = "" | 16 | IMAGE_LINK_NAME_linux.sb = "" |
17 | IMAGE_CMD_linux.sb () { | 17 | IMAGE_CMD_linux.sb () { |
18 | kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" | 18 | kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" |
19 | kernel_dtb="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" | 19 | kernel_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" |
20 | linux_bd_file=imx-bootlets-linux.bd-${MACHINE} | 20 | linux_bd_file=imx-bootlets-linux.bd-${MACHINE} |
21 | if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then | 21 | if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then |
22 | # When using device tree we build a zImage with the dtb | 22 | # When using device tree we build a zImage with the dtb |
@@ -24,16 +24,16 @@ IMAGE_CMD_linux.sb () { | |||
24 | linux_bd_file=imx-bootlets-linux.bd-dtb-${MACHINE} | 24 | linux_bd_file=imx-bootlets-linux.bd-dtb-${MACHINE} |
25 | cat $kernel_bin $kernel_dtb \ | 25 | cat $kernel_bin $kernel_dtb \ |
26 | > $kernel_bin-dtb | 26 | > $kernel_bin-dtb |
27 | rm -f ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb | 27 | rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb |
28 | ln -s $kernel_bin-dtb ${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb | 28 | ln -s $kernel_bin-dtb ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb |
29 | fi | 29 | fi |
30 | 30 | ||
31 | # Ensure the file is generated | 31 | # Ensure the file is generated |
32 | rm -f ${IMAGE_NAME}.linux.sb | 32 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb |
33 | elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb | 33 | (cd ${DEPLOY_DIR_IMAGE}; elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb) |
34 | 34 | ||
35 | # Remove the appended file as it is only used here | 35 | # Remove the appended file as it is only used here |
36 | rm -f $kernel_bin-dtb | 36 | rm -f ${DEPLOY_DIR_IMAGE}/$kernel_bin-dtb |
37 | } | 37 | } |
38 | 38 | ||
39 | # IMX Bootlets barebox bootstream | 39 | # IMX Bootlets barebox bootstream |