From 2b4c65289698705d91e4c601ece3f079c71cf433 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 30 Mar 2017 12:58:12 +0200 Subject: binman: Remove hard-coded file name for x86 flash-descriptor & intel-me Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names. Signed-off-by: Stefan Roese Cc: Bin Meng Cc: Simon Glass Reviewed-by: Bin Meng --- tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-) (limited to 'tools') 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' -- cgit v1.2.3 From ae5564d1aec8b39f55f283f8d187b7b1603533bf Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 4 Apr 2017 21:17:14 -0700 Subject: tools: binman: Add missing filenames for various x86 rom tests With recent changes, some x86-specific rom tests of binman fail to run. Fix it by adding missing filenames in corresponding entries. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- tools/binman/test/30_x86-rom-me-no-desc.dts | 1 + tools/binman/test/31_x86-rom-me.dts | 2 ++ tools/binman/test/32_intel-vga.dts | 1 + tools/binman/test/42_intel-fsp.dts | 1 + tools/binman/test/43_intel-cmc.dts | 1 + 5 files changed, 6 insertions(+) (limited to 'tools') 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"; }; }; }; -- cgit v1.2.3