From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 6 Aug 2012 16:17:31 +0000 (-0300)
Subject: Merge remote-tracking branch 'freescale/denzil' into master
X-Git-Tag: 2.1~1731
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=984ebbdfc2fdd6d26d6c9ce09398d22a2dd9843a;p=meta-freescale.git

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
---

984ebbdfc2fdd6d26d6c9ce09398d22a2dd9843a
diff --cc meta-fsl-arm/classes/image_types_fsl.bbclass
index 94ec4933,1ed817fc..1f4e6d4a
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@@ -101,16 -80,9 +101,16 @@@ generate_imx_sdcard () 
  	esac
  
  	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \
- 	                  | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }')
+ 	                  | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }')
  	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
  	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ::/uImage
 +	if [ -e "${KERNEL_IMAGETYPE}-${MACHINE}.dtb" ]; then
 +		kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
 +		kernel_dtb="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.dtb`"
 +		if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then
 +			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.dtb ::/machine.dtb
 +		fi
 +	fi
  
  	dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=1M
  	dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=${BOOT_SPACE}