diff options
| -rw-r--r-- | conf/machine/colibri-vf.conf | 3 | ||||
| -rw-r--r-- | recipes/images/trdx-image-fstype.inc | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index dd62253..9d4891d 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -11,7 +11,8 @@ require conf/machine/include/tune-cortexa5.inc SOC_FAMILY = "vf:vf60" -PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-fsl" +KERNEL_IMAGETYPE = "zImage" PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl" diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc index ad5e435..dbafc48 100644 --- a/recipes/images/trdx-image-fstype.inc +++ b/recipes/images/trdx-image-fstype.inc @@ -42,16 +42,25 @@ imagedeploytools_append_mx6() { cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_work.conf ${IMAGE_ROOT}/ } +imagedeploy_kernel() { + # put u-boot, kernel into the bin directories, remove the kernel/dtb from the rootfs/boot + # rm -f ${IMAGE_ROOTFS}/boot/uImage* ${IMAGE_ROOTFS}/boot/*.dtb + cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${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/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage +} + +imagedeploy_kernel_colibri-vf() { + # Do nothing, we use the kernel from /boot inside root fs + : +} + fakeroot do_imagedeploy() { cd ${WORKDIR} tar -xf ${BURNFLASH} cp -pPr burnflash/* ${IMAGE_NAME}${PV}/ - # put u-boot, kernel into the bin directories, remove the kernel/dtb from the rootfs/boot - rm -f ${IMAGE_ROOTFS}/boot/uImage* ${IMAGE_ROOTFS}/boot/*.dtb - cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${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/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/uImage + imagedeploy_kernel cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../${MACHINE}_bin/ rm -f ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-hsmmc-${MACHINE}.${U_BOOT_EXT} |