@@ -216,6 +216,9 @@ This is a blob containing a device tree. The contents of the blob are
obtained from the list of available device-tree files, managed by the
'state' module.
+Additional Properties / Entry arguments:
+ - prepend: Header type to use:
+ length: 32-bit length header
.. _etype_blob_ext:
@@ -7,6 +7,8 @@
from binman.entry import Entry
from binman.etype.blob import Entry_blob
+from dtoc import fdt_util
+import struct
# This is imported if needed
state = None
@@ -17,6 +19,9 @@ class Entry_blob_dtb(Entry_blob):
This is a blob containing a device tree. The contents of the blob are
obtained from the list of available device-tree files, managed by the
'state' module.
+
+ Additional attributes:
+ prepend: Header used (e.g. 'length')
"""
def __init__(self, section, etype, node):
# Put this here to allow entry-docs and help to work without libfdt
@@ -25,6 +30,15 @@ class Entry_blob_dtb(Entry_blob):
super().__init__(section, etype, node)
+ self.prepend = None
+
+ def ReadNode(self):
+ super().ReadNode()
+ self.prepend = fdt_util.GetString(self._node, 'prepend')
+ if self.prepend and self.prepend not in ['length']:
+ self.Raise("Invalid prepend in '%s': '%s'" %
+ (self._node.name, self.prepend))
+
def ObtainContents(self):
"""Get the device-tree from the list held by the 'state' module"""
self._filename = self.GetDefaultFilename()
@@ -35,6 +49,9 @@ class Entry_blob_dtb(Entry_blob):
"""Re-read the DTB contents so that we get any calculated properties"""
_, indata = state.GetFdtContents(self.GetFdtEtype())
data = self.CompressData(indata)
+ if self.prepend == 'length':
+ hdr = struct.pack('<I', len(data))
+ data = hdr + data
return self.ProcessContentsUpdate(data)
def GetFdtEtype(self):
@@ -50,6 +67,13 @@ class Entry_blob_dtb(Entry_blob):
fname = self.GetDefaultFilename()
return {self.GetFdtEtype(): [self, fname]}
+ def ReadData(self, decomp=True, alt_format=None):
+ data = super().ReadData(decomp, alt_format)
+ if self.prepend == 'length':
+ data_len = struct.unpack('<I', data[:4])[0]
+ data = data[4:4 + data_len]
+ return data
+
def WriteData(self, data, decomp=True):
ok = super().WriteData(data, decomp)
@@ -2536,6 +2536,28 @@ class TestFunctional(unittest.TestCase):
}
self.assertEqual(expected, props)
+ def testCompressPrependLengthDtb(self):
+ """Test that compress of device-tree files with length header is
+ supported
+ """
+ data = self.data = self._DoReadFileRealDtb('235_compress_prepend_length_dtb.dts')
+ self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)])
+ dtb_data = data[len(U_BOOT_DATA):]
+ comp_data_len = struct.unpack('<I', dtb_data[:4])[0]
+ comp_data = dtb_data[4:4 + comp_data_len]
+ orig = self._decompress(comp_data)
+ dtb = fdt.Fdt.FromData(orig)
+ dtb.Scan()
+ props = self._GetPropTree(dtb, ['size', 'uncomp-size'])
+ expected = {
+ 'u-boot:size': len(U_BOOT_DATA),
+ 'u-boot-dtb:uncomp-size': len(orig),
+ 'u-boot-dtb:size': len(dtb_data),
+ 'size': len(data),
+ }
+ self.assertEqual(expected, props)
+
+
def testCbfsUpdateFdt(self):
"""Test that we can update the device tree with CBFS offset/size info"""
self._CheckLz4()
new file mode 100644
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ u-boot {
+ };
+ u-boot-dtb {
+ compress = "lz4";
+ prepend = "length";
+ };
+ };
+};