From d9b4d0731e4ee7e23dc68dd1e30d7e2ceb947495 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 25 Jun 2015 18:43:36 +0200
Subject: [PATCH] meta-digi-arm: set BOARD_BOOTIMAGE_PARTITION_SIZE in KiB

This will allow in following commit to use the same VFAT boot image for
EMMC and SD. Until now we were creating different boot images for EMMC
and SD card images.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 13e9ec7608d42430c2a01a728d030752a71f7948)
---
 meta-digi-arm/classes/image_types_digi.bbclass | 2 +-
 meta-digi-arm/conf/machine/ccimx6sbc.conf      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass
index f4601c467..54e773b23 100644
--- a/meta-digi-arm/classes/image_types_digi.bbclass
+++ b/meta-digi-arm/classes/image_types_digi.bbclass
@@ -21,7 +21,7 @@ IMAGE_CMD_boot.vfat() {
 	# 1KB blocks for mkfs.vfat
 	BOOTIMG_BLOCKS="$(expr ${BOOTIMG_FILES_SIZE} / 1024)"
 	if [ -n "${BOARD_BOOTIMAGE_PARTITION_SIZE}" ]; then
-		BOOTIMG_BLOCKS="$(expr ${BOARD_BOOTIMAGE_PARTITION_SIZE} / 1024)"
+		BOOTIMG_BLOCKS="${BOARD_BOOTIMAGE_PARTITION_SIZE}"
 	fi
 
 	# POKY: Ensure total sectors is a multiple of sectors per track or mcopy will
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 330c8b4a7..dfbc75ef3 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -33,8 +33,8 @@ BT_TTY ?= "ttymxc1"
 # U-Boot script to be copied to the SD image
 BOOT_SCRIPTS = "boot-sd.scr:boot.scr"
 
-# Boot partition size for FAT image generation, 64MiB
-BOARD_BOOTIMAGE_PARTITION_SIZE ?= "67108864"
+# Boot partition size in KiB, (default 64MiB)
+BOARD_BOOTIMAGE_PARTITION_SIZE ?= "65536"
 
 # Flash image types
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"