binman: Convert existing binary blobs to blob_ext

Many of the existing blobs rely on external binaries which may not be
available. Move them over to use blob_ext to indicate this.

Unfortunately cros-ec-rw cannot use this class because it inherits
another. So set the 'external' value for that class.

While we are here, drop the import of Entry since it is not used (and
pylint3 complains).

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-07-09 18:39:37 -06:00
parent ce867ad7c8
commit 04e6a6b9ec
16 changed files with 29 additions and 39 deletions

View file

@ -19,3 +19,4 @@ class Entry_cros_ec_rw(Entry_blob_named_by_arg):
""" """
def __init__(self, section, etype, node): def __init__(self, section, etype, node):
super().__init__(section, etype, node, 'cros-ec-rw') super().__init__(section, etype, node, 'cros-ec-rw')
self.external = True

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Chip Microcode binary blob # Entry-type module for Intel Chip Microcode binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_cmc(Entry_blob): class Entry_intel_cmc(Entry_blob_ext):
"""Entry containing an Intel Chipset Micro Code (CMC) file """Entry containing an Intel Chipset Micro Code (CMC) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -8,7 +8,7 @@
import struct import struct
from binman.entry import Entry from binman.entry import Entry
from binman.etype.blob import Entry_blob from binman.etype.blob_ext import Entry_blob_ext
FD_SIGNATURE = struct.pack('<L', 0x0ff0a55a) FD_SIGNATURE = struct.pack('<L', 0x0ff0a55a)
MAX_REGIONS = 5 MAX_REGIONS = 5
@ -25,7 +25,7 @@ class Region:
self.limit = ((val & 0x0fff0000) >> 4) | 0xfff self.limit = ((val & 0x0fff0000) >> 4) | 0xfff
self.size = self.limit - self.base + 1 self.size = self.limit - self.base + 1
class Entry_intel_descriptor(Entry_blob): class Entry_intel_descriptor(Entry_blob_ext):
"""Intel flash descriptor block (4KB) """Intel flash descriptor block (4KB)
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -7,9 +7,9 @@
import struct import struct
from binman.etype.blob import Entry_blob from binman.etype.blob_ext import Entry_blob_ext
class Entry_intel_fit(Entry_blob): class Entry_intel_fit(Entry_blob_ext):
"""Intel Firmware Image Table (FIT) """Intel Firmware Image Table (FIT)
This entry contains a dummy FIT as required by recent Intel CPUs. The FIT This entry contains a dummy FIT as required by recent Intel CPUs. The FIT

View file

@ -7,9 +7,9 @@
import struct import struct
from binman.etype.blob import Entry_blob from binman.etype.blob_ext import Entry_blob_ext
class Entry_intel_fit_ptr(Entry_blob): class Entry_intel_fit_ptr(Entry_blob_ext):
"""Intel Firmware Image Table (FIT) pointer """Intel Firmware Image Table (FIT) pointer
This entry contains a pointer to the FIT. It is required to be at address This entry contains a pointer to the FIT. It is required to be at address

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Firmware Support Package binary blob # Entry-type module for Intel Firmware Support Package binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_fsp(Entry_blob): class Entry_intel_fsp(Entry_blob_ext):
"""Entry containing an Intel Firmware Support Package (FSP) file """Entry containing an Intel Firmware Support Package (FSP) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Firmware Support Package binary blob (M section) # Entry-type module for Intel Firmware Support Package binary blob (M section)
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_fsp_m(Entry_blob): class Entry_intel_fsp_m(Entry_blob_ext):
"""Entry containing Intel Firmware Support Package (FSP) memory init """Entry containing Intel Firmware Support Package (FSP) memory init
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Firmware Support Package binary blob (S section) # Entry-type module for Intel Firmware Support Package binary blob (S section)
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_fsp_s(Entry_blob): class Entry_intel_fsp_s(Entry_blob_ext):
"""Entry containing Intel Firmware Support Package (FSP) silicon init """Entry containing Intel Firmware Support Package (FSP) silicon init
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Firmware Support Package binary blob (T section) # Entry-type module for Intel Firmware Support Package binary blob (T section)
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_fsp_t(Entry_blob): class Entry_intel_fsp_t(Entry_blob_ext):
"""Entry containing Intel Firmware Support Package (FSP) temp ram init """Entry containing Intel Firmware Support Package (FSP) temp ram init
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -8,11 +8,11 @@
from collections import OrderedDict from collections import OrderedDict
from binman.entry import Entry from binman.entry import Entry
from binman.etype.blob import Entry_blob from binman.etype.blob_ext import Entry_blob_ext
from dtoc import fdt_util from dtoc import fdt_util
from patman import tools from patman import tools
class Entry_intel_ifwi(Entry_blob): class Entry_intel_ifwi(Entry_blob_ext):
"""Entry containing an Intel Integrated Firmware Image (IFWI) file """Entry containing an Intel Integrated Firmware Image (IFWI) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Management Engine binary blob # Entry-type module for Intel Management Engine binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_me(Entry_blob): class Entry_intel_me(Entry_blob_ext):
"""Entry containing an Intel Management Engine (ME) file """Entry containing an Intel Management Engine (ME) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Memory Reference Code binary blob # Entry-type module for Intel Memory Reference Code binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_mrc(Entry_blob): class Entry_intel_mrc(Entry_blob_ext):
"""Entry containing an Intel Memory Reference Code (MRC) file """Entry containing an Intel Memory Reference Code (MRC) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for Intel Memory Reference Code binary blob # Entry-type module for Intel Memory Reference Code binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_refcode(Entry_blob): class Entry_intel_refcode(Entry_blob_ext):
"""Entry containing an Intel Reference Code file """Entry containing an Intel Reference Code file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -4,10 +4,9 @@
# Entry-type module for Intel Video BIOS Table binary blob # Entry-type module for Intel Video BIOS Table binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_vbt(Entry_blob): class Entry_intel_vbt(Entry_blob_ext):
"""Entry containing an Intel Video BIOS Table (VBT) file """Entry containing an Intel Video BIOS Table (VBT) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -5,10 +5,9 @@
# Entry-type module for x86 VGA ROM binary blob # Entry-type module for x86 VGA ROM binary blob
# #
from binman.entry import Entry from binman.etype.blob_ext import Entry_blob_ext
from binman.etype.blob import Entry_blob
class Entry_intel_vga(Entry_blob): class Entry_intel_vga(Entry_blob_ext):
"""Entry containing an Intel Video Graphics Adaptor (VGA) file """Entry containing an Intel Video Graphics Adaptor (VGA) file
Properties / Entry arguments: Properties / Entry arguments:

View file

@ -4,7 +4,6 @@
# Entry-type module for the PowerPC mpc85xx bootpg and resetvec code for U-Boot # Entry-type module for the PowerPC mpc85xx bootpg and resetvec code for U-Boot
# #
from binman.entry import Entry
from binman.etype.blob import Entry_blob from binman.etype.blob import Entry_blob
class Entry_powerpc_mpc85xx_bootpg_resetvec(Entry_blob): class Entry_powerpc_mpc85xx_bootpg_resetvec(Entry_blob):