diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-08-06 13:17:31 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-08-06 13:17:31 -0300 |
| commit | 5f6b9909910c43d7f05cf4947af8d292bd5b60c8 (patch) | |
| tree | 45651b653f80661a7d45b2e9ab3ffc9448ff94a2 /classes | |
| parent | 8ec7204fcf19cdb99e87c7b4a6c0d7ed043ea643 (diff) | |
| parent | 4c37cc8af65709b9f29a2bc9115bc5c4ef9b7464 (diff) | |
| download | meta-fsl-arm-5f6b9909910c43d7f05cf4947af8d292bd5b60c8.tar.gz | |
Merge remote-tracking branch 'freescale/denzil' into master
* freescale/denzil:
image_types_fsl.bbclass: Calculate BOOT_BLOCKS for new boot partition num
linux-imx (2.6.35.3): Kernel patches from Freescale GIT
linux-imx (2.6.35.3): reduce delta against kernel source mx5_defconfig
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_fsl.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 94ec493..1f4e6d4 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass | |||
| @@ -101,7 +101,7 @@ generate_imx_sdcard () { | |||
| 101 | esac | 101 | esac |
| 102 | 102 | ||
| 103 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | 103 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ |
| 104 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') | 104 | | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') |
| 105 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS | 105 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS |
| 106 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ::/uImage | 106 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ::/uImage |
| 107 | if [ -e "${KERNEL_IMAGETYPE}-${MACHINE}.dtb" ]; then | 107 | if [ -e "${KERNEL_IMAGETYPE}-${MACHINE}.dtb" ]; then |