From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Fri, 30 Oct 2020 13:13:04 -0600 Subject: Please pull u-boot-dm Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/commits/master https://travis-ci.com/github/sjg20/u-boot/builds/196409920 https://dev.azure.com/simon0972/u-boot/_build?definitionId=1 The following changes since commit cdeb7b8f984e6d9bcdc5a6fdda6107af156d47bf: configs: Resync with savedefconfig (2020-10-29 10:48:01 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-30oct20 for you to fetch changes up to 2424057b2ad0eacdd2d81e35e7bea5df97802b8f: binman: Avoid calculated section data repeatedly (2020-10-29 14:42:59 -0600) ---------------------------------------------------------------- of-platdata and dtoc improvements sandbox SPL tests binman support for compressed sections ---------------------------------------------------------------- Dario Binacchi (1): dm: core: fix typo in device.h Heinrich Schuchardt (1): sandbox: make SDL window resizable Simon Glass (69): binman: Add a way to read the ROM offset binman: Support multiple images in the library dtoc: Extract inner loop from output_node() dtoc: Use a namedtuple for _links dm: core: Expand the comment for DM_GET_DEVICE() dm: core: Avoid void * in the of-platdata structs dm: Avoid using #ifdef for CONFIG_OF_LIVE dm: test: Sort the Makefile dm: test: Update Makefile conditions dm: test: Make use of CONFIG_UNIT_TEST dm: test: Disable some tests that should not run in SPL sandbox: Drop ad-hoc device declarations in SPL dtoc: Document the return value of scan_structs() dtoc: Order the structures internally by name dm: core: Allow dm_warn() to be used in SPL dtoc: Fix widening of int to bytes dm: test: Build tests for SPL dm: test: Update the test runner to support of-platdata dm: test: Add a way to run SPL tests dm: test: Add a very simple of-platadata test Makefile: Generate a symbol file for u-boot-spl pytest: Collect SPL unit tests test: Run SPL unit tests sandbox: Allow selection of SPL unit tests test: Run only the selected SPL test dm: test: Drop of-platdata pytest Azure/GitLab/Travis: Add SPL unit tests dm: Add a C test for of-platdata properties dm: test: Add a check that all devices have a dev value dm: test: Add a test for of-platdata phandles dm: Use an allocated array for run-time device info sandbox: Fix up building for of-platdata dm: Support parent devices with of-platdata dm: Add a test for of-platdata parent information dm: core: Convert #ifdef to if() in root.c x86: apl: Enable SPI flash in TPL with APL_SPI_FLASH_BOOT x86: apl: Take advantage of the of-platdata parent support dm: Use driver_info index instead of pointer imx: mx6cuboxi: Disable thermal driver in SPL dm: Don't allow U_BOOT_DEVICE() when of-platdata is used dm: doc: Update the of-platadata documentation binman: Update the entry docs binman: Drop unused return variable for _DoTestFile() binman: Add tests for skip-at-start sections binman: Give a sensible error if no command is given binman: Fix return from u-boot-ucode if there is no DT binman: Remove references to 'image' in entry_Section binman: Expand the error message for breaching a section binman: Move CompressData() into Entry base class binman: Use 'files-compress' to set compression for files binman: Update testPackExtra with more checks binman: Expand docs and test for padding binman: Expand docs and test for alignment binman: Move section-building code into a function binman: Refactor _BuildSectionData() binman: Move section padding to the parent binman: Make section padding consistent with other entries binman: Store the original data before compression binman: Set section contents in GetData() binman: Avoid reporting image-pos with compression binman: Drop Entry.CheckOffset() binman: Move sort and expand to the main Pack() function binman: Drop the Entry.CheckSize() method binman: Call CheckSize() from the section's Pack() method binman: Drop CheckEntries() binman: Update CheckEntries() for compressed sections binman: Use the actual contents in CheckSize() binman: Support compression of sections binman: Avoid calculated section data repeatedly .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- Makefile | 2 +- arch/arm/mach-imx/mx6/soc.c | 2 +- arch/sandbox/cpu/sdl.c | 3 +- arch/sandbox/cpu/spl.c | 18 +- arch/sandbox/cpu/start.c | 15 +- arch/sandbox/dts/sandbox.dts | 1 + arch/sandbox/dts/sandbox.dtsi | 27 ++ arch/sandbox/include/asm/state.h | 3 +- arch/x86/cpu/apollolake/Kconfig | 2 + arch/x86/cpu/apollolake/spl.c | 3 +- board/sandbox/sandbox.c | 2 + common/board_r.c | 19 +- configs/sandbox_spl_defconfig | 7 +- doc/driver-model/of-plat.rst | 42 ++- drivers/clk/clk-uclass.c | 3 +- drivers/clk/clk_fixed_rate.c | 4 +- drivers/clk/clk_sandbox.c | 4 +- drivers/core/Kconfig | 18 +- drivers/core/Makefile | 2 +- drivers/core/device.c | 23 +- drivers/core/lists.c | 70 ++++- drivers/core/root.c | 56 ++-- drivers/core/util.c | 2 +- drivers/i2c/Makefile | 2 +- drivers/i2c/i2c-emul-uclass.c | 2 + drivers/i2c/sandbox_i2c.c | 4 +- drivers/misc/irq-uclass.c | 2 +- drivers/misc/p2sb-uclass.c | 27 +- drivers/misc/spltest_sandbox.c | 35 --- drivers/mmc/fsl_esdhc_imx.c | 7 +- drivers/rtc/rtc-uclass.c | 2 + drivers/rtc/sandbox_rtc.c | 4 +- drivers/serial/sandbox.c | 3 + drivers/spi/ich.c | 4 +- drivers/sysreset/sysreset_sandbox.c | 2 + dts/Kconfig | 18 ++ include/asm-generic/global_data.h | 27 +- include/binman.h | 7 + include/config_uncmd_spl.h | 1 - include/dm/device-internal.h | 2 +- include/dm/device.h | 16 +- include/dm/of.h | 9 +- include/dm/platdata.h | 49 +++- include/dm/util.h | 2 +- include/dt-structs.h | 8 +- include/test/test.h | 11 + lib/binman.c | 14 +- scripts/Makefile.spl | 8 +- test/Kconfig | 10 + test/Makefile | 24 +- test/dm/Makefile | 13 +- test/dm/of_platdata.c | 222 ++++++++++++++++ test/dm/test-main.c | 69 +++-- test/py/conftest.py | 13 +- test/py/tests/test_ofplatdata.py | 47 ---- test/py/tests/test_spl.py | 34 +++ test/run | 2 +- tools/binman/README | 72 +++-- tools/binman/README.entries | 25 +- tools/binman/cmdline.py | 1 + tools/binman/control.py | 4 +- tools/binman/entry.py | 65 ++++- tools/binman/etype/blob.py | 7 - tools/binman/etype/cbfs.py | 6 +- tools/binman/etype/files.py | 7 +- tools/binman/etype/section.py | 167 +++++++++--- tools/binman/etype/u_boot_ucode.py | 1 + tools/binman/ftest.py | 409 ++++++++++++++++++++++++++++- tools/binman/image.py | 2 +- tools/binman/test/009_pack_extra.dts | 2 +- tools/binman/test/085_files_compress.dts | 2 +- tools/binman/test/177_skip_at_start.dts | 19 ++ tools/binman/test/178_skip_at_start_pad.dts | 21 ++ tools/binman/test/179_skip_at_start_section_pad.dts | 22 ++ tools/binman/test/180_section_pad.dts | 27 ++ tools/binman/test/181_section_align.dts | 34 +++ tools/binman/test/182_compress_image.dts | 14 + tools/binman/test/183_compress_image_less.dts | 14 + tools/binman/test/184_compress_section_size.dts | 17 ++ tools/binman/test/185_compress_section.dts | 16 ++ tools/binman/test/186_compress_extra.dts | 37 +++ tools/dtoc/dtb_platdata.py | 138 ++++++---- tools/dtoc/dtoc_test_simple.dts | 1 + tools/dtoc/fdt.py | 9 + tools/dtoc/test_dtoc.py | 178 ++++++++----- tools/dtoc/test_fdt.py | 10 + 89 files changed, 1860 insertions(+), 501 deletions(-) create mode 100644 test/dm/of_platdata.c create mode 100644 test/py/tests/test_spl.py create mode 100644 tools/binman/test/177_skip_at_start.dts create mode 100644 tools/binman/test/178_skip_at_start_pad.dts create mode 100644 tools/binman/test/179_skip_at_start_section_pad.dts create mode 100644 tools/binman/test/180_section_pad.dts create mode 100644 tools/binman/test/181_section_align.dts create mode 100644 tools/binman/test/182_compress_image.dts create mode 100644 tools/binman/test/183_compress_image_less.dts create mode 100644 tools/binman/test/184_compress_section_size.dts create mode 100644 tools/binman/test/185_compress_section.dts create mode 100644 tools/binman/test/186_compress_extra.dts Regards, Simon