[PATCH v2 13/49] binman: Convert existing binary blobs to blob_ext

[Bin Meng]

Hi Simon,

On Sun, Jun 14, 2020 at 10:57 AM Simon Glass <sjg at chromium.org> wrote:
>
> Many of the existing blobs rely on external binaries which may not be
> available. Move them over to use blob_ext to indicate this.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> (no changes since v1)
>
>  tools/binman/etype/cros_ec_rw.py                      | 1 +
>  tools/binman/etype/intel_cmc.py                       | 5 ++---
>  tools/binman/etype/intel_descriptor.py                | 4 ++--
>  tools/binman/etype/intel_fit.py                       | 4 ++--
>  tools/binman/etype/intel_fit_ptr.py                   | 4 ++--
>  tools/binman/etype/intel_fsp.py                       | 5 ++---
>  tools/binman/etype/intel_fsp_m.py                     | 5 ++---
>  tools/binman/etype/intel_fsp_s.py                     | 5 ++---
>  tools/binman/etype/intel_fsp_t.py                     | 5 ++---
>  tools/binman/etype/intel_ifwi.py                      | 4 ++--
>  tools/binman/etype/intel_me.py                        | 5 ++---
>  tools/binman/etype/intel_mrc.py                       | 5 ++---
>  tools/binman/etype/intel_refcode.py                   | 5 ++---
>  tools/binman/etype/intel_vbt.py                       | 5 ++---
>  tools/binman/etype/intel_vga.py                       | 5 ++---
>  tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py | 1 -
>  16 files changed, 29 insertions(+), 39 deletions(-)
>
> diff --git a/tools/binman/etype/cros_ec_rw.py b/tools/binman/etype/cros_ec_rw.py
> index 7ad62d0265..741372e1af 100644
> --- a/tools/binman/etype/cros_ec_rw.py
> +++ b/tools/binman/etype/cros_ec_rw.py
> @@ -19,3 +19,4 @@ class Entry_cros_ec_rw(Entry_blob_named_by_arg):
>      """
>      def __init__(self, section, etype, node):
>          super().__init__(section, etype, node, 'cros-ec-rw')
> +        self.external = True

Can this class be inherited from blob_ext?

> diff --git a/tools/binman/etype/intel_cmc.py b/tools/binman/etype/intel_cmc.py
> index 9ab471e7b6..644fa421d3 100644
> --- a/tools/binman/etype/intel_cmc.py
> +++ b/tools/binman/etype/intel_cmc.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Chip Microcode binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_cmc(Entry_blob):
> +class Entry_intel_cmc(Entry_blob_ext):
>      """Entry containing an Intel Chipset Micro Code (CMC) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py
> index 6afc42ece5..5b18893ccd 100644
> --- a/tools/binman/etype/intel_descriptor.py
> +++ b/tools/binman/etype/intel_descriptor.py
> @@ -8,7 +8,7 @@
>  import struct
>
>  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)
>  MAX_REGIONS    = 5
> @@ -25,7 +25,7 @@ class Region:
>          self.limit = ((val & 0x0fff0000) >> 4) | 0xfff
>          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)
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_fit.py b/tools/binman/etype/intel_fit.py
> index ad6c1caa85..f1a10c55a6 100644
> --- a/tools/binman/etype/intel_fit.py
> +++ b/tools/binman/etype/intel_fit.py
> @@ -7,9 +7,9 @@
>
>  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)
>
>      This entry contains a dummy FIT as required by recent Intel CPUs. The FIT
> diff --git a/tools/binman/etype/intel_fit_ptr.py b/tools/binman/etype/intel_fit_ptr.py
> index a06d12e740..01f082281c 100644
> --- a/tools/binman/etype/intel_fit_ptr.py
> +++ b/tools/binman/etype/intel_fit_ptr.py
> @@ -7,9 +7,9 @@
>
>  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
>
>      This entry contains a pointer to the FIT. It is required to be at address
> diff --git a/tools/binman/etype/intel_fsp.py b/tools/binman/etype/intel_fsp.py
> index a1c89adcea..2ac012bce1 100644
> --- a/tools/binman/etype/intel_fsp.py
> +++ b/tools/binman/etype/intel_fsp.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Firmware Support Package binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_fsp(Entry_blob):
> +class Entry_intel_fsp(Entry_blob_ext):
>      """Entry containing an Intel Firmware Support Package (FSP) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_fsp_m.py b/tools/binman/etype/intel_fsp_m.py
> index 4c225b24d3..434b0f1856 100644
> --- a/tools/binman/etype/intel_fsp_m.py
> +++ b/tools/binman/etype/intel_fsp_m.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Firmware Support Package binary blob (M section)
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_fsp_m(Entry_blob):
> +class Entry_intel_fsp_m(Entry_blob_ext):
>      """Entry containing Intel Firmware Support Package (FSP) memory init
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_fsp_s.py b/tools/binman/etype/intel_fsp_s.py
> index 9e1107182a..564e1228bb 100644
> --- a/tools/binman/etype/intel_fsp_s.py
> +++ b/tools/binman/etype/intel_fsp_s.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Firmware Support Package binary blob (S section)
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_fsp_s(Entry_blob):
> +class Entry_intel_fsp_s(Entry_blob_ext):
>      """Entry containing Intel Firmware Support Package (FSP) silicon init
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_fsp_t.py b/tools/binman/etype/intel_fsp_t.py
> index 5dca145a3f..df0c5fbee0 100644
> --- a/tools/binman/etype/intel_fsp_t.py
> +++ b/tools/binman/etype/intel_fsp_t.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Firmware Support Package binary blob (T section)
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -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
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py
> index ba63f6574f..b0c2b1aaa3 100644
> --- a/tools/binman/etype/intel_ifwi.py
> +++ b/tools/binman/etype/intel_ifwi.py
> @@ -8,11 +8,11 @@
>  from collections import OrderedDict
>
>  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 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
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_me.py b/tools/binman/etype/intel_me.py
> index 22f61f44d8..a55b159485 100644
> --- a/tools/binman/etype/intel_me.py
> +++ b/tools/binman/etype/intel_me.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Management Engine binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_me(Entry_blob):
> +class Entry_intel_me(Entry_blob_ext):
>      """Entry containing an Intel Management Engine (ME) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_mrc.py b/tools/binman/etype/intel_mrc.py
> index 74781848e2..ccbb046519 100644
> --- a/tools/binman/etype/intel_mrc.py
> +++ b/tools/binman/etype/intel_mrc.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Memory Reference Code binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_mrc(Entry_blob):
> +class Entry_intel_mrc(Entry_blob_ext):
>      """Entry containing an Intel Memory Reference Code (MRC) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_refcode.py b/tools/binman/etype/intel_refcode.py
> index 5754fec4f8..5ead08b2be 100644
> --- a/tools/binman/etype/intel_refcode.py
> +++ b/tools/binman/etype/intel_refcode.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for Intel Memory Reference Code binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_refcode(Entry_blob):
> +class Entry_intel_refcode(Entry_blob_ext):
>      """Entry containing an Intel Reference Code file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_vbt.py b/tools/binman/etype/intel_vbt.py
> index f6d7b466ea..2a98c12368 100644
> --- a/tools/binman/etype/intel_vbt.py
> +++ b/tools/binman/etype/intel_vbt.py
> @@ -4,10 +4,9 @@
>  # Entry-type module for Intel Video BIOS Table binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_vbt(Entry_blob):
> +class Entry_intel_vbt(Entry_blob_ext):
>      """Entry containing an Intel Video BIOS Table (VBT) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/intel_vga.py b/tools/binman/etype/intel_vga.py
> index 6b87c01b4c..a103f1ce0e 100644
> --- a/tools/binman/etype/intel_vga.py
> +++ b/tools/binman/etype/intel_vga.py
> @@ -5,10 +5,9 @@
>  # Entry-type module for x86 VGA ROM binary blob
>  #
>
> -from binman.entry import Entry
> -from binman.etype.blob import Entry_blob
> +from binman.etype.blob_ext import Entry_blob_ext
>
> -class Entry_intel_vga(Entry_blob):
> +class Entry_intel_vga(Entry_blob_ext):
>      """Entry containing an Intel Video Graphics Adaptor (VGA) file
>
>      Properties / Entry arguments:
> diff --git a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py b/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py
> index e6480f7a15..4276df2b55 100644
> --- a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py
> +++ b/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py
> @@ -4,7 +4,6 @@
>  # 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

This looks unrelated change

>
>  class Entry_powerpc_mpc85xx_bootpg_resetvec(Entry_blob):

Regards,
Bin