mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-17 23:37:01 +00:00
binman: Use a better error for missing Intel descriptor
FD is a bit confusing so write this out in full. Also avoid splitting the string so that people can grep for the error message more easily. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
497409fec4
commit
458be45afc
2 changed files with 3 additions and 3 deletions
|
@ -51,7 +51,7 @@ class Entry_intel_descriptor(Entry_blob):
|
|||
def GetOffsets(self):
|
||||
offset = self.data.find(FD_SIGNATURE)
|
||||
if offset == -1:
|
||||
self.Raise('Cannot find FD signature')
|
||||
self.Raise('Cannot find Intel Flash Descriptor (FD) signature')
|
||||
flvalsig, flmap0, flmap1, flmap2 = struct.unpack('<LLLL',
|
||||
self.data[offset:offset + 16])
|
||||
frba = ((flmap0 >> 16) & 0xff) << 4
|
||||
|
|
|
@ -806,8 +806,8 @@ class TestFunctional(unittest.TestCase):
|
|||
TestFunctional._MakeInputFile('descriptor.bin', b'')
|
||||
with self.assertRaises(ValueError) as e:
|
||||
self._DoTestFile('031_x86-rom-me.dts')
|
||||
self.assertIn("Node '/binman/intel-descriptor': Cannot find FD "
|
||||
"signature", str(e.exception))
|
||||
self.assertIn("Node '/binman/intel-descriptor': Cannot find Intel Flash Descriptor (FD) signature",
|
||||
str(e.exception))
|
||||
|
||||
def testPackX86RomBadDesc(self):
|
||||
"""Test that the Intel requires a descriptor entry"""
|
||||
|
|
Loading…
Add table
Reference in a new issue