From 59ea8c250b311ab5a414d5a36d9b07cd426ef74b Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 15 Aug 2017 22:41:54 -0700 Subject: [PATCH] tools: binman: Add a new entry type for Intel VBT This adds a new entry type for Intel Video BIOS Table. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- tools/binman/etype/intel_vbt.py | 14 ++++++++++++++ tools/binman/func_test.py | 9 ++++++++- tools/binman/test/46_intel-vbt.dts | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 tools/binman/etype/intel_vbt.py create mode 100644 tools/binman/test/46_intel-vbt.dts 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 +# +# 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"; + }; + }; +}; -- 2.25.1