From a520368424c701fa79392173dc233c5873f37116 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 26 Nov 2016 21:44:32 +0100 Subject: trdx-image-fstype: unify imagedeploy_kernel among machines Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- recipes-images/images/trdx-image-fstype.inc | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/recipes-images/images/trdx-image-fstype.inc b/recipes-images/images/trdx-image-fstype.inc index ebf5c25..808fd03 100644 --- a/recipes-images/images/trdx-image-fstype.inc +++ b/recipes-images/images/trdx-image-fstype.inc @@ -103,35 +103,14 @@ imagedeploytools_append_vf() { } imagedeploy_kernel() { - # put kernel, device-tree into the bin directories, remove the kernel/dtb from the rootfs/boot + # remove the kernel/dtb from the rootfs/boot if they exist + # put kernel, existing device-tree(s) into the bin directories rm -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGETYPE}* ${IMAGE_ROOTFS}/boot/*.dtb cp -pP ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${IMAGE_ROOTFS}/../${MACHINE}_bin/ mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/${KERNEL_IMAGETYPE} } -imagedeploy_kernel_mx7() { - imagedeploy_kernel_dtb -} - -imagedeploy_kernel_tegra2() { - # put kernel into the bin directories - rm -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGETYPE}* ${IMAGE_ROOTFS}/boot/*.dtb - cp -pP ${DEPLOY_DIR_IMAGE}/zImage* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ - mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/zImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/zImage -} - -imagedeploy_kernel_vf() { - imagedeploy_kernel_dtb -} - -imagedeploy_kernel_dtb() { - # put kernel, device-tree into the bin directories - cp -pP ${DEPLOY_DIR_IMAGE}/zImage* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ - ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${IMAGE_ROOTFS}/../${MACHINE}_bin/ - mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/zImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/zImage -} - fakeroot imagedeploy() { : } -- cgit v1.2.3