Please pull u-boot-dm (take 2)
Hi Tom,
This includes the gitlab fix and also I updated ifwitool.c to drop the unused inline functions.
The following changes since commit ff8c23e784f57a7098e91a200ed7f5a48612b653:
Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-dm.git tags/dm-pull-23jul19-take2
for you to fetch changes up to 6e38047b66e37659b937cf301e0de37a90d9eaa2:
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
----------------------------------------------------------------
Minor driver-model fixes and tweaks
A few device-tree fixes
Binman support for extracting files from an image
----------------------------------------------------------------
Anatolij Gustschin (1):
dm: device: make power domain calls optional
Baruch Siach (2):
dm: uclass: fix comment copy/paste error
buildman: fix invocation examples typos
Bin Meng (4):
dm: timer: Skip device that does not have a valid ofnode in pre_probe()
dm: core: Call clk_set_defaults() during probe() only for a valid ofnode
dm: core: Set correct "status" value for a node
dm: Fix parameter description of dev_read_name()
Marek Vasut (1):
common: fdt_support: Add missing cpu_to_fdt32() to fdt_pci_dma_ranges()
Masahiro Yamada (1):
fdt: make fdt_get_base_address() return OF_BAD_ADDR when "reg" not found
Sekhar Nori (1):
clk: initialize clk->data when using default xlate
Simon Glass (68):
x86: Add ifwitool for Intel Integrated Firmware Image
cbfs: Add an enum and comment for the magic number
cbfs: Rename checksum to attributes_offset
tools: Drop duplicate raise_on_error argument
binman: Fix comment in bsection.GetEntries()
binman: Correct two typos in function names in ftest
binman: Add coverage tools info for Python 3
patman: Add a way to set the search path for tools
binman: Add a --toolpath option to set the tool search path
binman: Add missing comments to bsection
binman: Add missing comments toentry
binman: Tidy up help for --indir
binman: Use a better error for missing Intel descriptor
binman: Detect skipped tests
binman: Add a function to create a sample ELF file
binman: Add a function to decode an ELF file
binman: Ensure that coverage has access to site packages
binman: Assume Intel descriptor is at the start of the image
binman: Don't assume there is an ME region
binman: Update entry.SetOffsetSize to be optional
binman: Allow text directly in the node
patman: Add functions to compress and decompress data
binman: Use the tools.Decompress method
binman: Drop unnecessary debug handling
binman: Use tools compression function for blob handling
binman: Correct comment in u_boot_spl_elf
binman: Support ELF files for TPL
binman: Fix up the _DoTestFile() function -u argument
binman: Allow verbosity control when running tests
binman: Allow preserving test directories
binman: Pass the toolpath to tests
patman: Add a function to write ifwitool
binman: Add a utility library for coreboot CBFS
binman: Add support for CBFS entries
binman: Add support for Intel IFWI entries
binman: Pad empty areas of the CBFS with files
binman: Add support for fixed-offset files in CBFS
binman: Simplify the entry test
binman: Update future features
binman: Update help for new features
binman: Add a convenience functions for real-DTB tests
binman: Add an FDT map
binman: Add an image header
binman: Convert to use ArgumentParser
binman: Move compression into the Entry base class
binman: Drop an unused arg in Entry.Lookup()
binman: Allow easy importing of entry modules
binman: Fix up ProcessUpdateContents error and comments
binman: Call ProcessUpdateContents() consistently
binman: Add a return value to ProcessContentsUpdate()
binman: Add a control for post-pack entry expansion
binman: Allow entries to expand after packing
binman: Allow device-tree entries to be compressed
binman: Provide the actual data address for cbfs files
binman: Use the cbfs memlen field only for uncompressed length
binman: Support FDT update for CBFS
binman: Detect bad CBFS file types
binman: Allow listing the entries in an image
binman: Support locating an FDT map
binman: Support locating an image header
binman: Support reading an image into an Image object
binman: Convert Image to a subclass of Entry
binman: Support listing an image
binman: Allow for logging information to be displayed
binman: Allow reading an entry from an image
binman: Support reading from CBFS entries
binman: Add an 'extract' command
binman: Add a test for nested and aligned sections
.gitlab-ci.yml | 2 +- .travis.yml | 3 +- Makefile | 4 +- common/fdt_support.c | 27 +- drivers/clk/clk-uclass.c | 2 + drivers/core/device.c | 17 +- drivers/core/ofnode.c | 2 +- drivers/timer/timer-uclass.c | 4 + fs/cbfs/cbfs.c | 4 +- include/cbfs.h | 16 +- include/dm/read.h | 2 +- include/dm/uclass.h | 2 +- test/run | 9 +- tools/Makefile | 3 + tools/binman/README | 154 ++++- tools/binman/README.entries | 282 ++++++++- tools/binman/binman.py | 91 ++- tools/binman/bsection.py | 464 -------------- tools/binman/cbfs_util.py | 887 ++++++++++++++++++++++++++ tools/binman/cbfs_util_test.py | 625 ++++++++++++++++++ tools/binman/cmdline.py | 99 ++- tools/binman/control.py | 212 +++++-- tools/binman/elf.py | 174 +++++ tools/binman/elf_test.py | 41 ++ tools/binman/entry.py | 187 +++++- tools/binman/entry_test.py | 32 +- tools/binman/etype/__init__.py | 0 tools/binman/etype/_testing.py | 14 +- tools/binman/etype/blob.py | 59 +- tools/binman/etype/blob_dtb.py | 10 +- tools/binman/etype/cbfs.py | 263 ++++++++ tools/binman/etype/fdtmap.py | 130 ++++ tools/binman/etype/files.py | 3 +- tools/binman/etype/fmap.py | 4 +- tools/binman/etype/image_header.py | 99 +++ tools/binman/etype/intel_descriptor.py | 16 +- tools/binman/etype/intel_ifwi.py | 100 +++ tools/binman/etype/intel_me.py | 2 + tools/binman/etype/section.py | 439 +++++++++++-- tools/binman/etype/text.py | 23 +- tools/binman/etype/u_boot_spl_elf.py | 2 +- tools/binman/etype/u_boot_tpl_elf.py | 24 + tools/binman/etype/u_boot_with_ucode_ptr.py | 8 +- tools/binman/ftest.py | 1039 ++++++++++++++++++++++++++++-- tools/binman/image.py | 315 +++++++--- tools/binman/image_test.py | 18 +- tools/binman/state.py | 26 +- tools/binman/test/066_text.dts | 5 + tools/binman/test/096_elf.dts | 2 + tools/binman/test/102_cbfs_raw.dts | 20 + tools/binman/test/103_cbfs_raw_ppc.dts | 21 + tools/binman/test/104_cbfs_stage.dts | 19 + tools/binman/test/105_cbfs_raw_compress.dts | 26 + tools/binman/test/106_cbfs_bad_arch.dts | 15 + tools/binman/test/107_cbfs_no_size.dts | 13 + tools/binman/test/108_cbfs_no_contents.dts | 17 + tools/binman/test/109_cbfs_bad_compress.dts | 18 + tools/binman/test/110_cbfs_name.dts | 24 + tools/binman/test/111_x86-rom-ifwi.dts | 29 + tools/binman/test/112_x86-rom-ifwi-nodesc.dts | 28 + tools/binman/test/113_x86-rom-ifwi-nodata.dts | 29 + tools/binman/test/114_cbfs_offset.dts | 26 + tools/binman/test/115_fdtmap.dts | 13 + tools/binman/test/116_fdtmap_hdr.dts | 17 + tools/binman/test/117_fdtmap_hdr_start.dts | 19 + tools/binman/test/118_fdtmap_hdr_pos.dts | 19 + tools/binman/test/119_fdtmap_hdr_missing.dts | 16 + tools/binman/test/120_hdr_no_location.dts | 16 + tools/binman/test/121_entry_expand.dts | 20 + tools/binman/test/122_entry_expand_twice.dts | 21 + tools/binman/test/123_entry_expand_section.dts | 22 + tools/binman/test/124_compress_dtb.dts | 14 + tools/binman/test/125_cbfs_update.dts | 21 + tools/binman/test/126_cbfs_bad_type.dts | 17 + tools/binman/test/127_list.dts | 33 + tools/binman/test/128_decode_image.dts | 36 ++ tools/binman/test/129_decode_image_nohdr.dts | 33 + tools/binman/test/130_list_fdtmap.dts | 36 ++ tools/binman/test/131_pack_align_section.dts | 28 + tools/binman/test/fitimage.bin.gz | Bin 0 -> 8418 bytes tools/binman/test/ifwi.bin.gz | Bin 0 -> 1884 bytes tools/buildman/README | 4 +- tools/ifwitool.c | 2304 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/patman/command.py | 4 +- tools/patman/test_util.py | 6 +- tools/patman/tools.py | 141 ++++- tools/patman/tout.py | 10 +- 87 files changed, 8158 insertions(+), 923 deletions(-) delete mode 100644 tools/binman/bsection.py create mode 100644 tools/binman/cbfs_util.py create mode 100755 tools/binman/cbfs_util_test.py create mode 100644 tools/binman/etype/__init__.py create mode 100644 tools/binman/etype/cbfs.py create mode 100644 tools/binman/etype/fdtmap.py create mode 100644 tools/binman/etype/image_header.py create mode 100644 tools/binman/etype/intel_ifwi.py create mode 100644 tools/binman/etype/u_boot_tpl_elf.py create mode 100644 tools/binman/test/102_cbfs_raw.dts create mode 100644 tools/binman/test/103_cbfs_raw_ppc.dts create mode 100644 tools/binman/test/104_cbfs_stage.dts create mode 100644 tools/binman/test/105_cbfs_raw_compress.dts create mode 100644 tools/binman/test/106_cbfs_bad_arch.dts create mode 100644 tools/binman/test/107_cbfs_no_size.dts create mode 100644 tools/binman/test/108_cbfs_no_contents.dts create mode 100644 tools/binman/test/109_cbfs_bad_compress.dts create mode 100644 tools/binman/test/110_cbfs_name.dts create mode 100644 tools/binman/test/111_x86-rom-ifwi.dts create mode 100644 tools/binman/test/112_x86-rom-ifwi-nodesc.dts create mode 100644 tools/binman/test/113_x86-rom-ifwi-nodata.dts create mode 100644 tools/binman/test/114_cbfs_offset.dts create mode 100644 tools/binman/test/115_fdtmap.dts create mode 100644 tools/binman/test/116_fdtmap_hdr.dts create mode 100644 tools/binman/test/117_fdtmap_hdr_start.dts create mode 100644 tools/binman/test/118_fdtmap_hdr_pos.dts create mode 100644 tools/binman/test/119_fdtmap_hdr_missing.dts create mode 100644 tools/binman/test/120_hdr_no_location.dts create mode 100644 tools/binman/test/121_entry_expand.dts create mode 100644 tools/binman/test/122_entry_expand_twice.dts create mode 100644 tools/binman/test/123_entry_expand_section.dts create mode 100644 tools/binman/test/124_compress_dtb.dts create mode 100644 tools/binman/test/125_cbfs_update.dts create mode 100644 tools/binman/test/126_cbfs_bad_type.dts create mode 100644 tools/binman/test/127_list.dts create mode 100644 tools/binman/test/128_decode_image.dts create mode 100644 tools/binman/test/129_decode_image_nohdr.dts create mode 100644 tools/binman/test/130_list_fdtmap.dts create mode 100644 tools/binman/test/131_pack_align_section.dts create mode 100644 tools/binman/test/fitimage.bin.gz create mode 100644 tools/binman/test/ifwi.bin.gz create mode 100644 tools/ifwitool.c
Regards,
Simon
PATCH 1/1 gitlab-ci: Update Docker image to xenial-20190720-24Jul2019 tag
- Add in lzma-alone for current binman tests
- Update to Ubuntu's xenial-20190720 tag (latest).
--- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
.gitlab-ci.yml +1 -1
@@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://gitlab.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:xenial-20190222-24April2019 +image: trini/u-boot-gitlab-ci-runner:xenial-20190720-24Jul2019 # We run some tests in different order, to catch some failures quicker. stages:
Signature · 1 line
2.7.4
PATCH 1/1 gitlab-ci: Update Docker image to xenial-20190720-24Jul2019 tag
Quoted 8 lines · Tom Rini
- Add in lzma-alone for current binman tests
- Update to Ubuntu's xenial-20190720 tag (latest).Signed-off-by Tom Rini <[email protected]>--- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 1/1 gitlab-ci: Update Docker image to xenial-20190720-24Jul2019 tag
In reply to Tom RiniQuoted 5 lines · Tom Rini
- Add in lzma-alone for current binman tests
- Update to Ubuntu's xenial-20190720 tag (latest).Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190725/0f1b3db4/attachment.sig>
Quoted 12 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)
Quoted 8 lines
are available in the Git repository at:
git://git.denx.de/u-boot-dm.gittags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/4c1a8cc1/attachment.sig>
Hi Tom,
Quoted 21 lines · Tom Rini
Quoted 18 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)are available in the Git repository at:
git://git.denx.de/u-boot-dm.gittags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:
Quoted 8 lines
Quoted 2 lines
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!
OK, this is another update that is needed to the gitlab config, this time the --toolpath argument. Will send an update.
I was rather hoping that pushing to gitlab u-boot-dm would start a build but it does not, for me. I probably need to do some more reading.
BTW Is there an intent to shut down travis?
Regards,
Simon
Am 24.07.2019 um 22:03 schrieb Simon Glass:
Quoted 33 lines
Hi Tom,
Quoted 21 lines · Tom Rini
Quoted 18 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' ofhttps://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-dm.git tags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:Quoted 8 lines
Quoted 2 lines
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!
Quoted 8 lines
OK, this is another update that is needed to the gitlab config, this time the --toolpath argument. Will send an update.
I was rather hoping that pushing to gitlab u-boot-dm would start a build but it does not, for me. I probably need to do some more reading.
BTW Is there an intent to shut down travis?
Even if everyone seems to be switching to gitlab, can we keep the travis config in the repository? That makes it easy for people (like me) creating a github clone to ensure the world keeps building after a patch.
Or is there a similar free and easy to use gitlab service comparable to travis?
Regards,
Simon
Quoted 41 lines · Simon Goldschmidt
Am 24.07.2019 um 22:03 schrieb Simon Glass:
Quoted 40 lines
Hi Tom,
Quoted 21 lines · Tom Rini
Quoted 18 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)are available in the Git repository at:
git://git.denx.de/u-boot-dm.gittags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:Quoted 8 lines
Quoted 2 lines
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!OK, this is another update that is needed to the gitlab config, this time the --toolpath argument. Will send an update.
I was rather hoping that pushing to gitlab u-boot-dm would start a build but it does not, for me. I probably need to do some more reading.
Quoted 8 lines
Quoted 1 line
BTW Is there an intent to shut down travis?
Even if everyone seems to be switching to gitlab, can we keep the travis config in the repository? That makes it easy for people (like me) creating a github clone to ensure the world keeps building after a patch.
Or is there a similar free and easy to use gitlab service comparable to travis?
So that's the rub. There are free "runners" in GitLab terms for projects but they are limited in time to I think an hour per job, so we get back to the unmaintainable mess of splitting the build like we have on Travis. Anyone can use their own machine as the runner, but that may or may not be faster or even slower than Travis is.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/5eabf4f8/attachment.sig>
Quoted 49 lines · Tom Rini
Quoted 47 lines · Simon Goldschmidt
Am 24.07.2019 um 22:03 schrieb Simon Glass:
Quoted 33 lines
Hi Tom,
Quoted 21 lines · Tom Rini
Quoted 18 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)are available in the Git repository at:
git://git.denx.de/u-boot-dm.gittags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:Quoted 8 lines
Quoted 2 lines
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!Quoted 8 lines
OK, this is another update that is needed to the gitlab config, this time the --toolpath argument. Will send an update.
I was rather hoping that pushing to gitlab u-boot-dm would start a build but it does not, for me. I probably need to do some more reading.
BTW Is there an intent to shut down travis?
Even if everyone seems to be switching to gitlab, can we keep the travis config in the repository? That makes it easy for people (like me) creating a github clone to ensure the world keeps building after a patch.
Quoted 8 lines
Quoted 2 lines
Or is there a similar free and easy to use gitlab service comparable to travis?
So that's the rub. There are free "runners" in GitLab terms for projects but they are limited in time to I think an hour per job, so we get back to the unmaintainable mess of splitting the build like we have on Travis. Anyone can use their own machine as the runner, but that may or may not be faster or even slower than Travis is.
I can assure you using my own PC is not an option for me compared to Travis. I don't know how many non-custodians there are using this (and I can probably arrange with Marek to use socfpga custodian access), but having a free-to-use CI seems worth much to me.
I don't know how much effort it is to keep and maintain the Travis config files though...
Regards,
Simon
Quoted 3 lines
--
Tom
Quoted 33 lines · Simon Glass
Hi Tom,
Quoted 21 lines · Tom Rini
Quoted 18 lines · Simon Glass
Hi Tom,
This includes the gitlab fix and also I updated
ifwitool.cto drop the unused inline functions.The following changes since commit
ff8c23e784f57a7098e91a200ed7f5a48612b653:Merge tag 'u-boot-stm32-20190723' of
https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-07-23 14:16:21 -0400)are available in the Git repository at:
git://git.denx.de/u-boot-dm.gittags/dm-pull-23jul19-take2for you to fetch changes up to
6e38047b66e37659b937cf301e0de37a90d9eaa2:Quoted 8 lines
Quoted 2 lines
dm: device: make power domain calls optional (2019-07-23 20:27:58 -0700)
We're still not there yet, sorry. Taking a look at
https://gitlab.denx.de/u-boot/u-boot/-/jobs/1464 we're now running things but ifwitool is failing. Can you please take a look? You will need the patch I posted that brings us up to a newer image that has lzma-alone. Thanks!
Quoted 6 lines
OK, this is another update that is needed to the gitlab config, this time the --toolpath argument. Will send an update.
I was rather hoping that pushing to gitlab u-boot-dm would start a build but it does not, for me. I probably need to do some more reading.
Take a look at the email I sent to the custodians list :) You'll need to flip a switch or two on the -dm tree for it to happen, and you can provide more build power for just your tree in addition to the shared runner we have currently.
Quoted 1 line
BTW Is there an intent to shut down travis?
As in remove the file? Not immediately, no, there's still the question of what to do about non-custodians being able to run CI before submitting.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/a0d9c9a3/attachment.sig>