binary-manager 0.1.2__tar.gz → 0.2.0__tar.gz

{binary_manager-0.1.2 → binary_manager-0.2.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: binary-manager
-Version: 0.1.2
+Version: 0.2.0
 Summary: Package firmware binaries into images described by a devicetree
 Author-email: Simon Glass <sjg@chromium.org>
 License-Expression: GPL-2.0-or-later
-Project-URL: Homepage, https://github.com/nxtboot/binman
+Project-URL: Homepage, https://github.com/deinde-dev/binman
 Project-URL: Documentation, https://binman.readthedocs.io/
-Project-URL: Repository, https://github.com/nxtboot/binman
-Project-URL: Bug Tracker, https://github.com/nxtboot/binman/issues
+Project-URL: Repository, https://github.com/deinde-dev/binman
+Project-URL: Bug Tracker, https://github.com/deinde-dev/binman/issues
 Keywords: firmware,image,devicetree,u-boot,fit,cbfs
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -24,16 +24,21 @@ Requires-Dist: pycryptodomex
 Requires-Dist: jsonschema
 Requires-Dist: PyYAML
 Requires-Dist: yamllint
+Requires-Dist: u-boot-pylib>=0.1.0
 Provides-Extra: test
 Requires-Dist: concurrencytest; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -55,15 +60,20 @@ they require, then use binman to stitch everything together into an image. It:
 - reads an image description from a devicetree and works out what to place
   where, with padding, alignment, compression and hashing;
 - supports hierarchical images and a large set of entry types, including FIT,
-  CBFS, ARM Trusted Firmware FIP and many SoC-specific formats;
+  coreboot's CBFS and flash maps, the ARM Trusted Firmware FIP and many
+  SoC-specific formats;
 - lets firmware find other binaries in the image, using linker symbols or the
   devicetree description of the image;
 - inspects existing images, extracting and replacing their contents and
   repacking where needed;
-- copes with missing binary blobs and fetches the external tools it needs.
+- copes with missing binary blobs and fetches the external tools it needs;
+- fetches firmware blobs such as TF-A, building them from source where it can,
+  and keeps them in a cache.
 
-Binman is designed primarily for use with U-Boot and associated binaries such
-as ARM Trusted Firmware, but is general enough to be used with other projects.
+Binman started as part of U-Boot and still builds U-Boot's images, but it is
+not tied to U-Boot. It can build coreboot images from a coreboot flash-map
+descriptor, and can package the firmware for TF-A, OP-TEE, Zephyr or any other
+project.
 
 Installation
 ------------
@@ -81,10 +91,17 @@ The ``binman`` command is then on your path.
 Quick start
 -----------
 
-Build an image from the description in a devicetree, taking the input files
-from the current directory::
+Build the images described in a devicetree, taking the input files from the
+current directory::
+
+    binman build -d image.dts -I .
+
+When run in a U-Boot build directory, or with one as an input directory,
+binman treats the devicetree as U-Boot's own, updating it with the image
+layout. To package U-Boot's binaries which have been copied elsewhere, select
+the u-boot project::
 
-    binman build -d u-boot.dtb
+    binman --project u-boot build -u -d u-boot.dtb -I .
 
 List the contents of an existing image::
 
@@ -95,6 +112,12 @@ missing::
 
     binman tool -f missing
 
+Fetch a firmware blob, here TF-A's BL31 for an Allwinner A64 board, building
+it from source::
+
+    binman blob -f arm,trusted-firmware-a --version 2.12 --arch aarch64 \
+        --plat sun50i_a64
+
 See ``binman -H`` for the complete manual, or the documentation linked below.
 
 Documentation
@@ -104,6 +127,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -121,5 +146,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.2.0}/README.rst

@@ -1,8 +1,12 @@
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -24,15 +28,20 @@ they require, then use binman to stitch everything together into an image. It:
 - reads an image description from a devicetree and works out what to place
   where, with padding, alignment, compression and hashing;
 - supports hierarchical images and a large set of entry types, including FIT,
-  CBFS, ARM Trusted Firmware FIP and many SoC-specific formats;
+  coreboot's CBFS and flash maps, the ARM Trusted Firmware FIP and many
+  SoC-specific formats;
 - lets firmware find other binaries in the image, using linker symbols or the
   devicetree description of the image;
 - inspects existing images, extracting and replacing their contents and
   repacking where needed;
-- copes with missing binary blobs and fetches the external tools it needs.
+- copes with missing binary blobs and fetches the external tools it needs;
+- fetches firmware blobs such as TF-A, building them from source where it can,
+  and keeps them in a cache.
 
-Binman is designed primarily for use with U-Boot and associated binaries such
-as ARM Trusted Firmware, but is general enough to be used with other projects.
+Binman started as part of U-Boot and still builds U-Boot's images, but it is
+not tied to U-Boot. It can build coreboot images from a coreboot flash-map
+descriptor, and can package the firmware for TF-A, OP-TEE, Zephyr or any other
+project.
 
 Installation
 ------------
@@ -50,10 +59,17 @@ The ``binman`` command is then on your path.
 Quick start
 -----------
 
-Build an image from the description in a devicetree, taking the input files
-from the current directory::
+Build the images described in a devicetree, taking the input files from the
+current directory::
+
+    binman build -d image.dts -I .
+
+When run in a U-Boot build directory, or with one as an input directory,
+binman treats the devicetree as U-Boot's own, updating it with the image
+layout. To package U-Boot's binaries which have been copied elsewhere, select
+the u-boot project::
 
-    binman build -d u-boot.dtb
+    binman --project u-boot build -u -d u-boot.dtb -I .
 
 List the contents of an existing image::
 
@@ -64,6 +80,12 @@ missing::
 
     binman tool -f missing
 
+Fetch a firmware blob, here TF-A's BL31 for an Allwinner A64 board, building
+it from source::
+
+    binman blob -f arm,trusted-firmware-a --version 2.12 --arch aarch64 \
+        --plat sun50i_a64
+
 See ``binman -H`` for the complete manual, or the documentation linked below.
 
 Documentation
@@ -73,6 +95,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -90,5 +114,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.2.0}/binary_manager.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: binary-manager
-Version: 0.1.2
+Version: 0.2.0
 Summary: Package firmware binaries into images described by a devicetree
 Author-email: Simon Glass <sjg@chromium.org>
 License-Expression: GPL-2.0-or-later
-Project-URL: Homepage, https://github.com/nxtboot/binman
+Project-URL: Homepage, https://github.com/deinde-dev/binman
 Project-URL: Documentation, https://binman.readthedocs.io/
-Project-URL: Repository, https://github.com/nxtboot/binman
-Project-URL: Bug Tracker, https://github.com/nxtboot/binman/issues
+Project-URL: Repository, https://github.com/deinde-dev/binman
+Project-URL: Bug Tracker, https://github.com/deinde-dev/binman/issues
 Keywords: firmware,image,devicetree,u-boot,fit,cbfs
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -24,16 +24,21 @@ Requires-Dist: pycryptodomex
 Requires-Dist: jsonschema
 Requires-Dist: PyYAML
 Requires-Dist: yamllint
+Requires-Dist: u-boot-pylib>=0.1.0
 Provides-Extra: test
 Requires-Dist: concurrencytest; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Dynamic: license-file
 
+.. image:: https://raw.githubusercontent.com/deinde-dev/binman/master/logo/binman-logo-primary.png
+   :alt: Binman
+   :width: 400px
+
 Binman firmware packager
 ========================
 
-.. image:: https://github.com/nxtboot/binman/actions/workflows/test.yml/badge.svg
-   :target: https://github.com/nxtboot/binman/actions/workflows/test.yml
+.. image:: https://github.com/deinde-dev/binman/actions/workflows/test.yml/badge.svg
+   :target: https://github.com/deinde-dev/binman/actions/workflows/test.yml
    :alt: Test status
 
 .. image:: https://img.shields.io/pypi/v/binary-manager.svg
@@ -55,15 +60,20 @@ they require, then use binman to stitch everything together into an image. It:
 - reads an image description from a devicetree and works out what to place
   where, with padding, alignment, compression and hashing;
 - supports hierarchical images and a large set of entry types, including FIT,
-  CBFS, ARM Trusted Firmware FIP and many SoC-specific formats;
+  coreboot's CBFS and flash maps, the ARM Trusted Firmware FIP and many
+  SoC-specific formats;
 - lets firmware find other binaries in the image, using linker symbols or the
   devicetree description of the image;
 - inspects existing images, extracting and replacing their contents and
   repacking where needed;
-- copes with missing binary blobs and fetches the external tools it needs.
+- copes with missing binary blobs and fetches the external tools it needs;
+- fetches firmware blobs such as TF-A, building them from source where it can,
+  and keeps them in a cache.
 
-Binman is designed primarily for use with U-Boot and associated binaries such
-as ARM Trusted Firmware, but is general enough to be used with other projects.
+Binman started as part of U-Boot and still builds U-Boot's images, but it is
+not tied to U-Boot. It can build coreboot images from a coreboot flash-map
+descriptor, and can package the firmware for TF-A, OP-TEE, Zephyr or any other
+project.
 
 Installation
 ------------
@@ -81,10 +91,17 @@ The ``binman`` command is then on your path.
 Quick start
 -----------
 
-Build an image from the description in a devicetree, taking the input files
-from the current directory::
+Build the images described in a devicetree, taking the input files from the
+current directory::
+
+    binman build -d image.dts -I .
+
+When run in a U-Boot build directory, or with one as an input directory,
+binman treats the devicetree as U-Boot's own, updating it with the image
+layout. To package U-Boot's binaries which have been copied elsewhere, select
+the u-boot project::
 
-    binman build -d u-boot.dtb
+    binman --project u-boot build -u -d u-boot.dtb -I .
 
 List the contents of an existing image::
 
@@ -95,6 +112,12 @@ missing::
 
     binman tool -f missing
 
+Fetch a firmware blob, here TF-A's BL31 for an Allwinner A64 board, building
+it from source::
+
+    binman blob -f arm,trusted-firmware-a --version 2.12 --arch aarch64 \
+        --plat sun50i_a64
+
 See ``binman -H`` for the complete manual, or the documentation linked below.
 
 Documentation
@@ -104,6 +127,8 @@ Full documentation is hosted on Read the Docs:
 
     https://binman.readthedocs.io/
 
+There is a short introduction, with a demo, at https://deinde.dev/binman/
+
 Development
 -----------
 
@@ -121,5 +146,6 @@ since the expected output tracks its development; pass ``--toolpath`` to point
 binman at a U-Boot ``tools/`` build directory. ``binman test -T`` checks that
 the tests cover all of the code.
 
-The ``u_boot_pylib`` and ``dtoc`` libraries are vendored from the U-Boot tree,
-so no surrounding U-Boot source is required.
+The ``dtoc`` library is vendored from the U-Boot tree and ``u_boot_pylib`` is
+installed from PyPI as ``u-boot-pylib``, so no surrounding U-Boot source is
+required.

{binary_manager-0.1.2 → binary_manager-0.2.0}/binary_manager.egg-info/SOURCES.txt

@@ -23,12 +23,15 @@ binman/control.py
 binman/elf.py
 binman/elf_test.py
 binman/entry.py
+binman/entry_groups.py
 binman/entry_test.py
 binman/fdt_test.py
 binman/fetchbase.py
 binman/fip_util.py
 binman/fip_util_test.py
 binman/fmap_util.py
+binman/fmd_util.py
+binman/fmd_util_test.py
 binman/ftest.py
 binman/image.py
 binman/image_test.py
@@ -38,21 +41,6 @@ binman/state.py
 binman/_vendor/dtoc/__init__.py
 binman/_vendor/dtoc/fdt.py
 binman/_vendor/dtoc/fdt_util.py
-binman/_vendor/u_boot_pylib/__init__.py
-binman/_vendor/u_boot_pylib/__main__.py
-binman/_vendor/u_boot_pylib/claude.py
-binman/_vendor/u_boot_pylib/command.py
-binman/_vendor/u_boot_pylib/cros_subprocess.py
-binman/_vendor/u_boot_pylib/dwarf_lines.py
-binman/_vendor/u_boot_pylib/gitutil.py
-binman/_vendor/u_boot_pylib/terminal.py
-binman/_vendor/u_boot_pylib/test_claude.py
-binman/_vendor/u_boot_pylib/test_command.py
-binman/_vendor/u_boot_pylib/test_dwarf_lines.py
-binman/_vendor/u_boot_pylib/test_gitutil.py
-binman/_vendor/u_boot_pylib/test_util.py
-binman/_vendor/u_boot_pylib/tools.py
-binman/_vendor/u_boot_pylib/tout.py
 binman/blobs/__init__.py
 binman/blobs/_testing.py
 binman/blobs/atf.py
@@ -179,6 +167,7 @@ binman/etype/x86_start16.py
 binman/etype/x86_start16_spl.py
 binman/etype/x86_start16_tpl.py
 binman/etype/xilinx_bootgen.py
+binman/include/binman_sym.h
 binman/test/Makefile
 binman/test/blob_syms.c
 binman/test/blob_syms.lds
@@ -255,6 +244,19 @@ binman/test/cbfs/bad_compress.dts
 binman/test/cbfs/bad_type.dts
 binman/test/cbfs/coreboot_rom.dts
 binman/test/cbfs/coreboot_rom_collection.dts
+binman/test/cbfs/coreboot_rom_create.dts
+binman/test/cbfs/coreboot_rom_create_missing.dts
+binman/test/cbfs/coreboot_rom_files.dts
+binman/test/cbfs/coreboot_rom_files_bad_type.dts
+binman/test/cbfs/coreboot_rom_files_collection.dts
+binman/test/cbfs/coreboot_rom_files_mixed.dts
+binman/test/cbfs/coreboot_rom_files_no_addr.dts
+binman/test/cbfs/coreboot_rom_files_no_content.dts
+binman/test/cbfs/coreboot_rom_files_not_elf.dts
+binman/test/cbfs/coreboot_rom_fmd.dts
+binman/test/cbfs/coreboot_rom_fmd_bad.dts
+binman/test/cbfs/coreboot_rom_fmd_both.dts
+binman/test/cbfs/coreboot_rom_fmd_region_name.dts
 binman/test/cbfs/coreboot_rom_missing.dts
 binman/test/cbfs/coreboot_rom_nested_spl.dts
 binman/test/cbfs/coreboot_rom_no_addr.dts
@@ -291,6 +293,7 @@ binman/test/entry/compress_image.dts
 binman/test/entry/compress_image_less.dts
 binman/test/entry/compress_section.dts
 binman/test/entry/compress_section_size.dts
+binman/test/entry/compress_section_update.dts
 binman/test/entry/elf.dts
 binman/test/entry/elf_strip.dts
 binman/test/entry/entry_args.dts
@@ -300,6 +303,7 @@ binman/test/entry/entry_args_unknown_datatype.dts
 binman/test/entry/env.dts
 binman/test/entry/env_no_size.dts
 binman/test/entry/env_too_small.dts
+binman/test/entry/etype_dir.dts
 binman/test/entry/files.dts
 binman/test/entry/files_align.dts
 binman/test/entry/files_compress.dts
@@ -344,6 +348,8 @@ binman/test/entry/unique_names.dts
 binman/test/entry/unique_names_multi.dts
 binman/test/entry/unknown_contents.dts
 binman/test/entry/unknown_pos_size.dts
+binman/test/etype_dir/dev_etype.py
+binman/test/etype_dir/fill.py
 binman/test/fdt/alternates_fdt.dts
 binman/test/fdt/alternates_fdtgrep.dts
 binman/test/fdt/alternates_inval.dts
@@ -372,6 +378,8 @@ binman/test/fdt/incl.dts
 binman/test/fdt/incl_tpl.dts
 binman/test/fdt/incl_vpl.dts
 binman/test/fdt/list_fdtmap.dts
+binman/test/fdt/plain.dts
+binman/test/fdt/plain_section.dts
 binman/test/fdt/update.dts
 binman/test/fdt/update_all.dts
 binman/test/fdt/update_all_repack.dts

{binary_manager-0.1.2 → binary_manager-0.2.0}/binary_manager.egg-info/requires.txt

@@ -4,6 +4,7 @@ pycryptodomex
 jsonschema
 PyYAML
 yamllint
+u-boot-pylib>=0.1.0
 
 [test]
 concurrencytest

binary_manager-0.2.0/binman/__init__.py

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+"""Binman firmware packager
+
+binman bundles a copy of dtoc's devicetree modules in _vendor/. Make these
+importable by their usual name, ahead of any other copies, e.g. in a U-Boot
+tree. They are kept out of the top level of site-packages, where they would
+clash with U-Boot's tools and with the separate dtoc package.
+"""
+
+import os
+import sys
+
+_VENDOR_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                           '_vendor')
+if _VENDOR_DIR not in sys.path:
+    sys.path.insert(0, _VENDOR_DIR)