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

1 files changed, 1 insertions, 1 deletions

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index 94ec49338..1f4e6d4a7 100644
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@ -101,7 +101,7 @@ 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