diff options
| author | Tom Rini <[email protected]> | 2017-04-10 08:07:29 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-04-10 08:07:29 -0400 |
| commit | 01cce5fdd098add2b8aa570468cb35fca5d778fe (patch) | |
| tree | 279174c700f36ef4c8a38b30e8c39be8b32e80e6 /tools | |
| parent | e391b1e64b0bd65709a28a4764afe4f32d408243 (diff) | |
| parent | ca0d29e4f06095fd39f3125aef8f427aa1728ee5 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/etype/intel_descriptor.py | 3 | ||||
| -rw-r--r-- | tools/binman/etype/intel_me.py | 3 | ||||
| -rw-r--r-- | tools/binman/test/30_x86-rom-me-no-desc.dts | 1 | ||||
| -rw-r--r-- | tools/binman/test/31_x86-rom-me.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/32_intel-vga.dts | 1 | ||||
| -rw-r--r-- | tools/binman/test/42_intel-fsp.dts | 1 | ||||
| -rw-r--r-- | tools/binman/test/43_intel-cmc.dts | 1 |
7 files changed, 6 insertions, 6 deletions
diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py index 7f4ea0b21be..6435749e7cd 100644 --- a/tools/binman/etype/intel_descriptor.py +++ b/tools/binman/etype/intel_descriptor.py @@ -37,9 +37,6 @@ class Entry_intel_descriptor(Entry_blob): Entry_blob.__init__(self, image, etype, node) self._regions = [] - def GetDefaultFilename(self): - return 'descriptor.bin' - def GetPositions(self): pos = self.data.find(FD_SIGNATURE) if pos == -1: diff --git a/tools/binman/etype/intel_me.py b/tools/binman/etype/intel_me.py index 45ab50c1ec3..5e1c7993b7b 100644 --- a/tools/binman/etype/intel_me.py +++ b/tools/binman/etype/intel_me.py @@ -12,6 +12,3 @@ from blob import Entry_blob class Entry_intel_me(Entry_blob): def __init__(self, image, etype, node): Entry_blob.__init__(self, image, etype, node) - - def GetDefaultFilename(self): - return 'me.bin' diff --git a/tools/binman/test/30_x86-rom-me-no-desc.dts b/tools/binman/test/30_x86-rom-me-no-desc.dts index 4578f660ac0..68d3ce09ecd 100644 --- a/tools/binman/test/30_x86-rom-me-no-desc.dts +++ b/tools/binman/test/30_x86-rom-me-no-desc.dts @@ -9,6 +9,7 @@ end-at-4gb; size = <16>; intel-me { + filename = "me.bin"; pos-unset; }; }; diff --git a/tools/binman/test/31_x86-rom-me.dts b/tools/binman/test/31_x86-rom-me.dts index b484ab31cf7..ee3dac875a6 100644 --- a/tools/binman/test/31_x86-rom-me.dts +++ b/tools/binman/test/31_x86-rom-me.dts @@ -9,9 +9,11 @@ end-at-4gb; size = <0x800000>; intel-descriptor { + filename = "descriptor.bin"; }; intel-me { + filename = "me.bin"; pos-unset; }; }; diff --git a/tools/binman/test/32_intel-vga.dts b/tools/binman/test/32_intel-vga.dts index 1790833238f..9c532d03d3c 100644 --- a/tools/binman/test/32_intel-vga.dts +++ b/tools/binman/test/32_intel-vga.dts @@ -8,6 +8,7 @@ size = <16>; intel-vga { + filename = "vga.bin"; }; }; }; diff --git a/tools/binman/test/42_intel-fsp.dts b/tools/binman/test/42_intel-fsp.dts index e0a1e76f130..8a7c889251b 100644 --- a/tools/binman/test/42_intel-fsp.dts +++ b/tools/binman/test/42_intel-fsp.dts @@ -8,6 +8,7 @@ size = <16>; intel-fsp { + filename = "fsp.bin"; }; }; }; diff --git a/tools/binman/test/43_intel-cmc.dts b/tools/binman/test/43_intel-cmc.dts index 26c456def78..5a56c7d881a 100644 --- a/tools/binman/test/43_intel-cmc.dts +++ b/tools/binman/test/43_intel-cmc.dts @@ -8,6 +8,7 @@ size = <16>; intel-cmc { + filename = "cmc.bin"; }; }; }; |