diff options
author | Tom Rini <trini@konsulko.com> | 2017-09-17 11:46:51 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-09-17 11:46:51 -0400 |
commit | c07f38208a73bbe3efaa939d6742096c1cb7e0ce (patch) | |
tree | 147b5e7f26a4e8e240feeb9c919cdec0c7b6de37 /tools | |
parent | 08cebeeaadd9192dd501308ac6a8b858ffa255c1 (diff) | |
parent | 8a1c44271c55961fb70fb6177f9c02fdb05287c5 (diff) |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools')
-rw-r--r-- | tools/binman/etype/intel_vbt.py | 14 | ||||
-rw-r--r-- | tools/binman/func_test.py | 9 | ||||
-rw-r--r-- | tools/binman/test/46_intel-vbt.dts | 14 |
3 files changed, 36 insertions, 1 deletions
diff --git a/tools/binman/etype/intel_vbt.py b/tools/binman/etype/intel_vbt.py new file mode 100644 index 0000000000..29aedaffca --- /dev/null +++ b/tools/binman/etype/intel_vbt.py @@ -0,0 +1,14 @@ +# +# Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# +# Entry-type module for Intel Video BIOS Table binary blob +# + +from entry import Entry +from blob import Entry_blob + +class Entry_intel_vbt(Entry_blob): + def __init__(self, image, etype, node): + Entry_blob.__init__(self, image, etype, node) diff --git a/tools/binman/func_test.py b/tools/binman/func_test.py index 8b4db41659..c4207ce5d2 100644 --- a/tools/binman/func_test.py +++ b/tools/binman/func_test.py @@ -38,6 +38,7 @@ X86_START16_DATA = 'start16' U_BOOT_NODTB_DATA = 'nodtb with microcode pointer somewhere in here' FSP_DATA = 'fsp' CMC_DATA = 'cmc' +VBT_DATA = 'vbt' class TestFunctional(unittest.TestCase): """Functional tests for binman @@ -74,6 +75,7 @@ class TestFunctional(unittest.TestCase): TestFunctional._MakeInputFile('u-boot-nodtb.bin', U_BOOT_NODTB_DATA) TestFunctional._MakeInputFile('fsp.bin', FSP_DATA) TestFunctional._MakeInputFile('cmc.bin', CMC_DATA) + TestFunctional._MakeInputFile('vbt.bin', VBT_DATA) self._output_setup = False # ELF file with a '_dt_ucode_base_size' symbol @@ -801,6 +803,11 @@ class TestFunctional(unittest.TestCase): self.assertEqual(FSP_DATA, data[:len(FSP_DATA)]) def testPackCmc(self): - """Test that an image with a FSP binary can be created""" + """Test that an image with a CMC binary can be created""" data = self._DoReadFile('43_intel-cmc.dts') self.assertEqual(CMC_DATA, data[:len(CMC_DATA)]) + + def testPackVbt(self): + """Test that an image with a VBT binary can be created""" + data = self._DoReadFile('46_intel-vbt.dts') + self.assertEqual(VBT_DATA, data[:len(VBT_DATA)]) diff --git a/tools/binman/test/46_intel-vbt.dts b/tools/binman/test/46_intel-vbt.dts new file mode 100644 index 0000000000..733f5751d5 --- /dev/null +++ b/tools/binman/test/46_intel-vbt.dts @@ -0,0 +1,14 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + intel-vbt { + filename = "vbt.bin"; + }; + }; +}; |