aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-04-11 10:51:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 23:05:16 +0100
commit13d5e41a8ad3d8fa1935196c24f51ff5b1ecaa85 (patch)
tree21fc2d13dc86c4ed3df789227bdbf96a94051f2b
parent96c64075246b2252962cee1e8b6db4b139022f87 (diff)
downloadopenembedded-core-13d5e41a8ad3d8fa1935196c24f51ff5b1ecaa85.zip
openembedded-core-13d5e41a8ad3d8fa1935196c24f51ff5b1ecaa85.tar.gz
openembedded-core-13d5e41a8ad3d8fa1935196c24f51ff5b1ecaa85.tar.bz2
bootimg: Fix a math thinko in the block count calculation
Fixes [YOCTO #1852] ... again. The conversion from sectors to blocks was multiplying by 2 instead of dividing by 2. Blocks are 1024 bytes, sectors are 512 bytes. The result was images being much larger than intended. Reported-by: Tom Zanussi <tom.zanussi@intel.com> (From OE-Core rev: b35384fa3ca96b31c63d764322215abced2066e4) Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Backported to edison by Darren Hart. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/bootimg.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index c2d43c8..489819b 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -92,7 +92,8 @@ build_boot_bin() {
SECTORS=$(expr $SECTORS + $(expr $DIR_SECTORS + $FAT_SECTORS))
# Determine the final size in blocks accounting for some padding
- BLOCKS=$(expr $(expr $SECTORS \* 2) + ${BOOTIMG_EXTRA_SPACE})
+ BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE})
+
# Ensure total sectors is an integral number of sectors per
# track or mcopy will complain. Sectors are 512 bytes, and we