pack_firmware: Use 0xff padding to align blobs
Since the target is flash chip, use 0xff padding instead of 0x00
padding.
Also modify some varible names and comments to make them more clear.
BUG=chrome-os-partner:12566
TEST=build image success
BRANCH=all
Change-Id: I80f425cfc44ad388e46d4f87bd7007b0a4f06c1a
Reviewed-on: https://gerrit.chromium.org/gerrit/30480
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Ready: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>
diff --git a/host/lib/tools.py b/host/lib/tools.py
index 30921a5..e7097a4 100755
--- a/host/lib/tools.py
+++ b/host/lib/tools.py
@@ -222,20 +222,20 @@
Returns:
A tuple of a string and two list. The string is the concated data read
from file, in the same order as in filenames, aligned to 4-byte. The
- first list contains the address of each file in the data string and
- the second one contains the length of each file, both in the same
- order.
+ first list contains the offset of each file in the data string and
+ the second one contains the actual (non-padded) length of each file,
+ both in the same order.
"""
data = ''
- address = []
+ offset = []
length = []
for fname in filenames:
- address.append(len(data))
+ offset.append(len(data))
content = self.ReadFile(fname)
pad_len = ((len(content) + 3) & ~3) - len(content)
- data += content + '\0' * pad_len
+ data += content + chr(0xff) * pad_len
length.append(len(content))
- return data, address, length
+ return data, offset, length
def GetChromeosVersion(self):
"""Returns the ChromeOS version string