diff options
author | Simon Glass <sjg@chromium.org> | 2021-04-03 11:05:10 +1300 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2021-04-29 03:23:39 -0700 |
commit | 1736575b0cfe5dfe511a2904dd84289fc781728e (patch) | |
tree | 98596a380d7ea8185f6701c2300c3815a6504a7e /tools/binman/ftest.py | |
parent | c7722e84170a1b855da808c6e6aab4f871b15e0d (diff) | |
download | u-boot-1736575b0cfe5dfe511a2904dd84289fc781728e.zip u-boot-1736575b0cfe5dfe511a2904dd84289fc781728e.tar.gz u-boot-1736575b0cfe5dfe511a2904dd84289fc781728e.tar.bz2 |
binman: Support adding sections to FMAPs
When used with hierarchical images, use the Chromium OS convention of
adding a section before all the subentries it contains.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman/ftest.py')
-rw-r--r-- | tools/binman/ftest.py | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index d0a1d99..f36823f 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1595,19 +1595,31 @@ class TestFunctional(unittest.TestCase): self.assertEqual(1, fhdr.ver_major) self.assertEqual(0, fhdr.ver_minor) self.assertEqual(0, fhdr.base) - expect_size = fmap_util.FMAP_HEADER_LEN + fmap_util.FMAP_AREA_LEN * 3 + expect_size = fmap_util.FMAP_HEADER_LEN + fmap_util.FMAP_AREA_LEN * 5 self.assertEqual(16 + 16 + expect_size, fhdr.image_size) self.assertEqual(b'FMAP', fhdr.name) - self.assertEqual(3, fhdr.nareas) + self.assertEqual(5, fhdr.nareas) fiter = iter(fentries) fentry = next(fiter) + self.assertEqual(b'SECTION0', fentry.name) + self.assertEqual(0, fentry.offset) + self.assertEqual(16, fentry.size) + self.assertEqual(0, fentry.flags) + + fentry = next(fiter) self.assertEqual(b'RO_U_BOOT', fentry.name) self.assertEqual(0, fentry.offset) self.assertEqual(4, fentry.size) self.assertEqual(0, fentry.flags) fentry = next(fiter) + self.assertEqual(b'SECTION1', fentry.name) + self.assertEqual(16, fentry.offset) + self.assertEqual(16, fentry.size) + self.assertEqual(0, fentry.flags) + + fentry = next(fiter) self.assertEqual(b'RW_U_BOOT', fentry.name) self.assertEqual(16, fentry.offset) self.assertEqual(4, fentry.size) @@ -2067,8 +2079,8 @@ class TestFunctional(unittest.TestCase): self.assertEqual(expected, data[:32]) fhdr, fentries = fmap_util.DecodeFmap(data[36:]) - self.assertEqual(0x100, fhdr.image_size) - expect_size = fmap_util.FMAP_HEADER_LEN + fmap_util.FMAP_AREA_LEN * 3 + self.assertEqual(0x180, fhdr.image_size) + expect_size = fmap_util.FMAP_HEADER_LEN + fmap_util.FMAP_AREA_LEN * 4 fiter = iter(fentries) fentry = next(fiter) @@ -2077,6 +2089,11 @@ class TestFunctional(unittest.TestCase): self.assertEqual(4, fentry.size) fentry = next(fiter) + self.assertEqual(b'SECTION', fentry.name) + self.assertEqual(4, fentry.offset) + self.assertEqual(0x20 + expect_size, fentry.size) + + fentry = next(fiter) self.assertEqual(b'INTEL_MRC', fentry.name) self.assertEqual(4, fentry.offset) self.assertEqual(3, fentry.size) |