Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-02 09:36:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

binman: Increase size of TPL and SPL test data

Browse source 
At present these are large enough to hold 20 bytes of symbol data. Add
four more bytes so we can add another test.

Unfortunately at present this involves changing a few test files to make
room. We could adjust the test files to not specify sizes for entries.
Then we could make the tests check the actual sizes. But for now, leave it
as it is, since the effort is minor.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-08-24 07:23:04 -06:00
parent bf4d0e2842
commit eb0086fa59
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/binman/ftest.py
View file

@ -39,8 +39,8 @@ import tout
# Contents of test files, corresponding to different entry types # Contents of test files, corresponding to different entry types
U_BOOT_DATA = b'1234' U_BOOT_DATA = b'1234'
U_BOOT_IMG_DATA = b'img' U_BOOT_IMG_DATA = b'img'
U_BOOT_SPL_DATA = b'56780123456789abcde' U_BOOT_SPL_DATA = b'56780123456789abcdefghi'
U_BOOT_TPL_DATA = b'tpl9876543210fedcb' U_BOOT_TPL_DATA = b'tpl9876543210fedcbazyw'
BLOB_DATA = b'89' BLOB_DATA = b'89'
ME_DATA = b'0abcd' ME_DATA = b'0abcd'
VGA_DATA = b'vga' VGA_DATA = b'vga'
@ -922,7 +922,7 @@ class TestFunctional(unittest.TestCase):
"""Test that a basic x86 ROM can be created""" """Test that a basic x86 ROM can be created"""
self._SetupSplElf() self._SetupSplElf()
data = self._DoReadFile('029_x86_rom.dts') data = self._DoReadFile('029_x86_rom.dts')
self.assertEqual(U_BOOT_DATA + tools.GetBytes(0, 7) + U_BOOT_SPL_DATA + self.assertEqual(U_BOOT_DATA + tools.GetBytes(0, 3) + U_BOOT_SPL_DATA +
tools.GetBytes(0, 2), data) tools.GetBytes(0, 2), data)
def testPackX86RomMeNoDesc(self): def testPackX86RomMeNoDesc(self):
@ -1236,7 +1236,7 @@ class TestFunctional(unittest.TestCase):
self._SetupSplElf('u_boot_binman_syms') self._SetupSplElf('u_boot_binman_syms')
data = self._DoReadFile('053_symbols.dts') data = self._DoReadFile('053_symbols.dts')
sym_values = struct.pack('<LQL', 0, 24, 20) sym_values = struct.pack('<LQL', 0, 28, 24)
expected = (sym_values + U_BOOT_SPL_DATA[16:] + expected = (sym_values + U_BOOT_SPL_DATA[16:] +
tools.GetBytes(0xff, 1) + U_BOOT_DATA + sym_values + tools.GetBytes(0xff, 1) + U_BOOT_DATA + sym_values +
U_BOOT_SPL_DATA[16:]) U_BOOT_SPL_DATA[16:])
@ -3305,7 +3305,7 @@ class TestFunctional(unittest.TestCase):
self._SetupSplElf('u_boot_binman_syms') self._SetupSplElf('u_boot_binman_syms')
self._SetupTplElf('u_boot_binman_syms') self._SetupTplElf('u_boot_binman_syms')
data = self._DoReadFile('149_symbols_tpl.dts') data = self._DoReadFile('149_symbols_tpl.dts')
sym_values = struct.pack('<LQL', 4, 0x18, 0x30) sym_values = struct.pack('<LQL', 4, 0x1c, 0x34)
upto1 = 4 + len(U_BOOT_SPL_DATA) upto1 = 4 + len(U_BOOT_SPL_DATA)
expected1 = tools.GetBytes(0xff, 4) + sym_values + U_BOOT_SPL_DATA[16:] expected1 = tools.GetBytes(0xff, 4) + sym_values + U_BOOT_SPL_DATA[16:]
self.assertEqual(expected1, data[:upto1]) self.assertEqual(expected1, data[:upto1])
@ -3314,8 +3314,8 @@ class TestFunctional(unittest.TestCase):
expected2 = tools.GetBytes(0xff, 1) + sym_values + U_BOOT_SPL_DATA[16:] expected2 = tools.GetBytes(0xff, 1) + sym_values + U_BOOT_SPL_DATA[16:]
self.assertEqual(expected2, data[upto1:upto2]) self.assertEqual(expected2, data[upto1:upto2])
upto3 = 0x30 + len(U_BOOT_DATA) upto3 = 0x34 + len(U_BOOT_DATA)
expected3 = tools.GetBytes(0xff, 5) + U_BOOT_DATA expected3 = tools.GetBytes(0xff, 1) + U_BOOT_DATA
self.assertEqual(expected3, data[upto2:upto3]) self.assertEqual(expected3, data[upto2:upto3])
expected4 = sym_values + U_BOOT_TPL_DATA[16:] expected4 = sym_values + U_BOOT_TPL_DATA[16:]

2
tools/binman/test/021_image_pad.dts
View file

@ -10,7 +10,7 @@
}; };
u-boot { u-boot {
offset = <20>; offset = <24>;
}; };
}; };
}; };

2
tools/binman/test/024_sorted.dts
View file

@ -7,7 +7,7 @@
binman { binman {
sort-by-offset; sort-by-offset;
u-boot { u-boot {
offset = <22>; offset = <26>;
}; };
u-boot-spl { u-boot-spl {

2
tools/binman/test/028_pack_4gb_outside.dts
View file

@ -13,7 +13,7 @@
}; };
u-boot-spl { u-boot-spl {
offset = <0xffffffeb>; offset = <0xffffffe7>;
}; };
}; };
}; };

2
tools/binman/test/029_x86_rom.dts
View file

@ -13,7 +13,7 @@
}; };
u-boot-spl { u-boot-spl {
offset = <0xffffffeb>; offset = <0xffffffe7>;
}; };
}; };
}; };

2
tools/binman/test/053_symbols.dts
View file

@ -10,7 +10,7 @@
}; };
u-boot { u-boot {
offset = <20>; offset = <24>;
}; };
u-boot-spl2 { u-boot-spl2 {

4
tools/binman/test/149_symbols_tpl.dts
View file

@ -11,12 +11,12 @@
}; };
u-boot-spl2 { u-boot-spl2 {
offset = <0x18>; offset = <0x1c>;
type = "u-boot-spl"; type = "u-boot-spl";
}; };
u-boot { u-boot {
offset = <0x30>; offset = <0x34>;
}; };
section { section {