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

diff --cc meta-fsl-arm/classes/image_types_fsl.bbclass
index 94ec493389b4b8810300a11d86ab5b70a62f9dae,1ed817fc94f8edcff2e0d1617768dca994e5200c..1f4e6d4a7d8d87cad383ed221bc4e89665d5cc31
--- 1/meta-fsl-arm/classes/image_types_fsl.bbclass
--- 2/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}

diff --cc meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
Simple merge