March 2021 - U-Boot

[PATCH] arm: socfpga: Only do 'is OS booted from FIT' checking when VAB is enabled
by Siew Chin Lim 23 Mar '21

23 Mar '21

Check CONFIG_SOCFPGA_SECURE_VAB_AUTH before perform 'is OS booted from FIT' checking in board_prep_linux function. And, fix typo of CONFIG_SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE. CONFIG_FIT will be enabled in both ATF and VAB boot flow, thus, board_prep_linux function will always be called by both ATF and VAB boot flow. board_pre_linux function will do 'is OS booted from FIT' checking, and it will be called before board_fit_image_post_process function. VAB boot flow expects the OS is always booted from FIT and with VAB signed cerfiticate because the VAB authentication is implemented in board_fit_image_post_process function. So, VAB needs the 'is OS booted from FIT' checking in board_pre_linux function. However, for ATF boot flow, it is not a requirement that the OS must always booted from FIT. The OS can be booted from individual Image and kernel dtb file. Thus, we should not do 'if OS is booted from FIT' checking in board_prep_linux function. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim(a)intel.com> --- arch/arm/mach-socfpga/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 81aa07c902..650122fcd4 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -115,7 +115,8 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) #if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_FIT) void board_prep_linux(bootm_headers_t *images) { - if (!IS_ENABLED(CONFIG_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { + if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH) && + !IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { /* * Ensure the OS is always booted from FIT and with * VAB signed certificate -- 2.13.0

2 1

[PATCH 0/6] Use -ENOSYS consistently
by Simon Glass 23 Mar '21

23 Mar '21

A few places use -ENOTSUPP when they should use -ENOSYS. In two cases both are used. This little series tidies this up. Simon Glass (6): usb: Return -ENOSYS when system call is not available spi: Return -ENOSYS when system call is not available tlv_eeprom: Return -ENOSYS when system call is not available clk: Return -ENOSYS when system call is not available simple-pm-bus: Use -ENOSYS for checking missing system call pinctrl: Return -ENOSYS when system call is not available drivers/clk/clk-composite.c | 8 ++++---- drivers/core/simple-pm-bus.c | 4 ++-- drivers/pinctrl/pinctrl-uclass.c | 10 ++++++---- drivers/usb/gadget/udc/udc-uclass.c | 2 +- include/spi-mem.h | 2 +- include/tlv_eeprom.h | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) -- 2.31.0.rc2.261.g7f71774620-goog

4 13

[PATCH v5 00/41] test: Refactor tests to have a single test runner
by Simon Glass 23 Mar '21

23 Mar '21

At present U-Boot has two broad sets of tests in the C code: driver model tests which do a lot of pre-/post-init and command tests which do not. This separation makes it slightly harder to write a test, since there are two different test-state structures and different rules for running the two different test types. At present these rules are determined by where the test is (actually its prefix). All unit tests can be run from the command line with the 'ut' command. Since SPL does not have commands, it currently calls the test runner directly and offers no control of which tests are run. This seems like a good time to refactor the tests into a unified test runner, allowing U-Boot proper and SPL to use the same path, perhaps with some different conditions along the way. This series sets up a unified runner called ut_run_list(), which runs a set of tests from a linker_list. Driver model tests are distinguished by a new UT_TESTF_DM flag so that the necessary init and cleanup can still be done. The runner is modified to support running SPL tests that are not solely for driver model. An example test for FIT loading is added as a demonstration. In addition, some documentation is added to explain how to write tests. This series is available at u-boot-dm/test-working Changes in v5: - Update the test so we don't need a flag - Update based on Heinrich's comments - Mention UEFI tests - Update language to make it clear when sandbox is discussed - Update table based on Heinrich's comments Changes in v4: - Fix 'of-pldata' typo - Rebase on master - Add correct SPDX header Changes in v3: - Add new patch to re-enable test_ofplatdata - Reword the SPL tests section for clarity - Use test_set_state() throughout test-main.c instead of direct assignment - Update the pytest collector as well Changes in v2: - Use correct rst format for 'Ad-hoc tests' section - Expand docs on how each type of test is marked - Put the docs in tests_sandbox since it is more related to sandbox - Put in a mention of tests_sandbox in the main testing docs - Add a note that SPL tests can in fact be run individualy - Document how to run all C tests with 'ut all' - Fix 'get list' typo - Fix conditions so non-DM SPL tests are actually run - Allow for prefix to be NULL, to match function comment - Add new patches to cover running an SPL test Simon Glass (41): dm: core: Fix allocation of empty of-platdata doc: Tidy up testing section doc: Document make tcheck sandbox: Drop the 'starting...' message test: Re-enable test_ofplatdata doc: Explain how to run tests without pytest doc: Document how sandbox_spl_tests are run test: Correct setexpr test prefix test: Mark all driver model tests with a flag test: Rename test-main.c to test-dm.c test: Add an overall test runner test: Create pre/post-run functions test: Call test_pre/post_run() from driver model tests test: Move dm_extended_scan() to test_pre_run() test: Move do_autoprobe() to test_pre_run() test: Move dm_scan_plat() to test_pre_run() test: Drop mallinfo() work-around test: Move console silencing to test_pre_run() test: Move delay skipping to test_pre_run() test: Handle driver model reinit in test_pre_run() test: Drop struct dm_test_state test: Move dm_test_init() into test-main.c test: Move dm_test_destroy() into test-main.c test: Move test running into a separate function test: Use ut_run_test() to run driver model tests test: Drop dm_do_test() test: Add ut_run_test_live_flat() to run tests twice test: Use a local variable for test state test: Run driver-model tests using ut_run_list() test: Use return values in dm_test_run() test: Move the devicetree check into ut_run_list() test: Move restoring of driver model state to ut_run_list() test: log: Rename log main test file to log_ut.c test: Add a macros for finding tests in linker_lists test: Rename all linker lists to have a ut_ prefix test: Allow SPL to run any available test sandbox: Update os_find_u_boot() to find the .img file spl: Convert spl_fit to work with sandbox spl: test: Add a test for spl_load_simple_fit() test: sandbox: Move sandbox test docs into doc/develop doc: Explain briefly how to write new tests arch/sandbox/cpu/os.c | 8 +- arch/sandbox/cpu/spl.c | 9 +- arch/sandbox/cpu/start.c | 1 - common/spl/spl.c | 3 +- common/spl/spl_fit.c | 27 +- configs/sandbox_spl_defconfig | 2 +- doc/arch/sandbox.rst | 48 +--- doc/develop/index.rst | 2 + doc/develop/py_testing.rst | 3 +- doc/develop/testing.rst | 46 +++- doc/develop/tests_sandbox.rst | 209 ++++++++++++++ doc/develop/tests_writing.rst | 346 +++++++++++++++++++++++ drivers/core/device.c | 17 +- include/dm/test.h | 20 +- include/os.h | 3 +- include/spl.h | 9 + include/test/test.h | 38 ++- include/test/ut.h | 45 +++ test/Makefile | 3 + test/bloblist.c | 5 +- test/bootm.c | 4 +- test/cmd/mem.c | 4 +- test/cmd/setexpr.c | 28 +- test/cmd_ut.c | 38 +-- test/compression.c | 5 +- test/dm/Makefile | 2 +- test/dm/core.c | 58 ++-- test/dm/test-dm.c | 51 ++++ test/dm/test-driver.c | 12 +- test/dm/test-main.c | 230 ---------------- test/dm/test-uclass.c | 10 +- test/env/cmd_ut_env.c | 4 +- test/image/Makefile | 5 + test/image/spl_load.c | 91 ++++++ test/lib/cmd_ut_lib.c | 4 +- test/log/Makefile | 2 +- test/log/{test-main.c => log_ut.c} | 4 +- test/optee/cmd_ut_optee.c | 5 +- test/overlay/cmd_ut_overlay.c | 5 +- test/py/conftest.py | 2 +- test/py/tests/test_log.py | 1 - test/py/tests/test_ofplatdata.py | 2 +- test/str_ut.c | 5 +- test/test-main.c | 426 +++++++++++++++++++++++++++++ test/unicode_ut.c | 4 +- test/ut.c | 7 + 46 files changed, 1407 insertions(+), 446 deletions(-) create mode 100644 doc/develop/tests_sandbox.rst create mode 100644 doc/develop/tests_writing.rst create mode 100644 test/dm/test-dm.c delete mode 100644 test/dm/test-main.c create mode 100644 test/image/Makefile create mode 100644 test/image/spl_load.c rename test/log/{test-main.c => log_ut.c} (75%) create mode 100644 test/test-main.c -- 2.30.1.766.gb4fecdf3b7-goog

4 46

Please pull u-boot-dm/next (take 3)
by Simon Glass 22 Mar '21

22 Mar '21

Hi Tom, This is for the -next branch. https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/6871 The following changes since commit 874dcedee92a828b03c8d3146dccfaa8b709618b: Merge branch '2021-03-20-mediatek-updates' into next (2021-03-20 19:27:22 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-21mar21-take3 for you to fetch changes up to fcc6fbba8ae003954b5e23461a9f5814d86a23b7: binman: Update various pieces of the documentation (2021-03-22 19:23:30 +1300) ---------------------------------------------------------------- dtoc support for of-platdata-inst driver model support for of-platdata-inst support of-platdata-inst on x86 / coral binman support for exapanded entries binman convert docs to reST ti-sysc fix for duplicate uclass driver patman minor improvements ---------------------------------------------------------------- Bin Meng (3): mmc: pci: Fix Kconfig dependency test: cmd: setexpr: Fix a typo test: print_ut: Fix potential build error Dario Binacchi (1): bus: ti-sysc: change in a normal driver Heinrich Schuchardt (4): sandbox: allow cross-compiling sandbox sandbox: enable cros-ec-keyb in test.dtb dm: error handling dev_get_dma_range() sandbox: add FAT to the list of usable env drivers Nicolas Boichat (1): patman: Use less for help file, if available Samuel Dionne-Riel (1): tools: fdtgrep: Use unsigned chars for arrays Simon Glass (104): azure: Use --board flag with sandbox_spl patman: Update documentation to match new usage patman: Quieten down the alias checking dtoc: Scan drivers for available information dtoc: Save scan information across test runs dtoc: Ignore unwanted files when scanning for drivers dtoc: Collect priv/plat struct info from drivers dtoc: Support scanning of uclasses dtoc: Support scanning of structs in header files dtoc: Move test files into a test/ directory dtoc: Rename sandbox_i2c_test and sandbox_pmic_test dtoc: Add some extra properties to nodes dtoc: Make use of node properties dtoc: Process nodes to set up required properties dtoc: Track nodes which are actually used dtoc: Support tracking the phase of U-Boot Makefile: Pass the U-Boot phase to dtoc dtoc: Support headers needed for drivers dtoc: Process driver aliases along with drivers dtoc: Warn of duplicate drivers dtoc: Read aliases for uclasses dtoc: Detect drivers only at the start of start of line dtoc: Assign a sequence number to each node dtoc: Set up the uclasses that are used dtoc: Support processing the root node dtoc: Add an option for device instantiation dm: of-platadata: Add option for device instantiation dtoc: Add support for decl file dtoc: Don't generate platform data with instantiation sandbox: Make sandbox,emul more conventional sandbox: i2c: Rename driver names to work with of-platdata dtoc: Tidy up the list of supported phandle properties dtoc: Generate a summary in the dt-plat.c file dtoc: Generate uclass devices dtoc: Generate device instances dtoc: Drop use of DECL() macros sandbox: Drop debug message in os_spl_to_uboot() linker_lists: Allow use in data structures dm: core: Add macros to access the new linker lists dm: core: Allow dropping run-time binding of devices dm: core: Adjust uclass setup with of-platdata dm: core: Set up driver model for OF_PLATDATA_INST dm: core: Skip adding uclasses with OF_PLATDATA_INST dm: Add the new dtoc-generated files to the build dm: core: Include dt-decl.h automatically dm: test: Avoid destroying uclasses with of-platdata-inst clk: sandbox: Move priv/plat data to a header file clk: fixed-rate: Export driver parts for OF_PLATDATA_INST clk: sandbox: Create a special fixed-rate driver dm: core: Drop device_get_by_driver_info() dm: core: Drop uclass_find_device_by_phandle() with of-platdata sandbox: i2c: Move platdata structs to header files dm: Rename device_get_by_driver_info_idx() sandbox_spl: Increase SPL malloc() size sandbox: i2c: Support i2c emulation with of-platdata Revert "sandbox: Disable I2C emulators in SPL" sandbox: Create a new sandbox_noinst build test: Run sandbox_spl tests on sandbox_noinst azure/gitlab: Add tests for sandbox_noinst dm: core: Add an option to support SPL in read-only memory dm: core: Create a struct for device runtime info dm: core: Move flags to device-runtime info dm: core: Allow storing priv/plat data separately sandbox: Define a region for device priv/plat data dm: core: Use separate priv/plat data region dm: core: Add warnings to private / platform setters dm: doc: Tidy up of-platdata docs dm: doc: Add documentation for of-platdata-inst x86: Define a region for device priv/plat data x86: apl: Fix the header order in pmc x86: apl: Tell of-platdata about a required header file x86: itss: Tidy up bind() for of-platdata-inst x86: Support a fake PCI device with of-platdata-inst x86: Don't include reset driver in SPL x86: coral: Drop ACPI properties from of-platdata x86: coral: Drop TPM and ACPI interrupts from TPL x86: apl: Use read-only SPL and new of-platdata binman: Allow extracting to current directory binman: Document ExpandEntries() in the base class binman: Update entry help for files-align binman: Tidy up underscores in entry documentation binman: Correct the documentation for u-boot-spl-bss-pad binman: Support symbols in u-boot-spl-nodtb binman: Add support for u-boot-tpl-nodtb binman: Add support for u-boot-tpl-bss-bad binman: Drop unnecessary 'type' property in tests binman: Use the fake SPL/TPL only if requested binman: Drop unnecessary field in output_fdt_info binman: Move the comment for GetFdts() to the base class binman: Use standard filenames for SPL/TPL devicetree binman: Allow using an an 'expanded' entry type binman: Allow a way to select expanded entries binman: Plumb expanded entries through fully binman: Automatically expand phase binaries into sections Makefile: Pass new entry args to binman x86: Make use of binman expanded entries x86: dts: Drop unused CONFIG_SPL doc: Move UEFI under develop/ doc: Move driver model docs under develop/ binman: doc: Add documentation to htmldocs binman: Rearrange documentation into headings binman: Incorporate entry documentation binman: Drop repetitive heading for each entry binman: Update various pieces of the documentation .azure-pipelines.yml | 5 +- .gitlab-ci.yml | 10 +- Makefile | 18 +- arch/sandbox/cpu/os.c | 1 - arch/sandbox/cpu/u-boot-spl.lds | 8 + arch/sandbox/dts/sandbox.dtsi | 18 +- arch/sandbox/dts/test.dts | 5 +- arch/sandbox/include/asm/clk.h | 24 + arch/sandbox/include/asm/i2c.h | 15 + arch/sandbox/include/asm/rtc.h | 24 + arch/x86/cpu/apollolake/Kconfig | 2 + arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/apollolake/punit.c | 1 + arch/x86/cpu/intel_common/itss.c | 5 +- arch/x86/cpu/u-boot-spl.lds | 8 + arch/x86/dts/chromebook_coral.dts | 10 +- arch/x86/dts/reset.dtsi | 2 +- arch/x86/dts/u-boot.dtsi | 17 +- arch/x86/lib/tpl.c | 1 + board/sandbox/MAINTAINERS | 7 + board/sandbox/sandbox.c | 1 + common/spl/Kconfig | 24 + configs/chromebook_coral_defconfig | 1 + configs/sandbox_noinst_defconfig | 231 ++++++++++ configs/sandbox_spl_defconfig | 3 + doc/arch/x86.rst | 4 +- doc/{ => develop}/driver-model/bind.rst | 0 doc/{ => develop}/driver-model/debugging.rst | 0 doc/{ => develop}/driver-model/design.rst | 0 doc/{ => develop}/driver-model/ethernet.rst | 0 doc/{ => develop}/driver-model/fdt-fixup.rst | 0 doc/{ => develop}/driver-model/fs_firmware_loader.rst | 0 doc/{ => develop}/driver-model/i2c-howto.rst | 0 doc/{ => develop}/driver-model/index.rst | 4 + doc/{ => develop}/driver-model/livetree.rst | 0 doc/{ => develop}/driver-model/migration.rst | 0 doc/develop/driver-model/of-plat.rst | 913 ++++++++++++++++++++++++++++++++++++++ doc/{ => develop}/driver-model/pci-info.rst | 1 + doc/{ => develop}/driver-model/pmic-framework.rst | 0 doc/{ => develop}/driver-model/remoteproc-framework.rst | 0 doc/{ => develop}/driver-model/serial-howto.rst | 0 doc/{ => develop}/driver-model/soc-framework.rst | 0 doc/{ => develop}/driver-model/spi-howto.rst | 0 doc/{ => develop}/driver-model/usb-info.rst | 0 doc/develop/index.rst | 10 + doc/develop/package/binman.rst | 1 + doc/develop/package/entries.rst | 1 + doc/develop/package/index.rst | 19 + doc/{ => develop}/uefi/index.rst | 4 + doc/{ => develop}/uefi/iscsi.rst | 0 doc/{ => develop}/uefi/u-boot_on_efi.rst | 0 doc/{ => develop}/uefi/uefi.rst | 0 doc/driver-model/of-plat.rst | 359 --------------- doc/index.rst | 23 - doc/usage/fit.rst | 8 + doc/usage/index.rst | 1 + drivers/bus/ti-sysc.c | 6 - drivers/clk/clk-uclass.c | 2 +- drivers/clk/clk_fixed_rate.c | 14 +- drivers/clk/clk_sandbox.c | 40 +- drivers/clk/clk_sandbox_test.c | 6 - drivers/core/device.c | 111 +++-- drivers/core/of_addr.c | 4 +- drivers/core/root.c | 85 +++- drivers/core/uclass.c | 7 +- drivers/i2c/Makefile | 2 - drivers/i2c/i2c-emul-uclass.c | 34 +- drivers/misc/irq-uclass.c | 2 +- drivers/misc/test_drv.c | 11 +- drivers/mmc/Kconfig | 1 + drivers/mmc/fsl_esdhc_imx.c | 3 +- drivers/rtc/i2c_rtc_emul.c | 21 +- drivers/rtc/sandbox_rtc.c | 13 + dts/Kconfig | 83 +++- include/asm-generic/global_data.h | 26 +- include/asm-generic/sections.h | 3 + include/dm/device-internal.h | 93 ++++ include/dm/device.h | 108 ++++- include/dm/platdata.h | 15 - include/dm/root.h | 3 + include/dm/test.h | 5 + include/dm/uclass-internal.h | 52 +++ include/dm/uclass.h | 31 ++ include/dm/util.h | 9 + include/dt-structs.h | 2 + include/i2c.h | 15 + include/linker_lists.h | 12 + include/linux/clk-provider.h | 5 + scripts/Makefile.spl | 9 +- test/cmd/setexpr.c | 2 +- test/dm/of_platdata.c | 32 +- test/dm/test-fdt.c | 6 +- test/print_ut.c | 2 +- test/run | 4 + test/test-main.c | 30 +- tools/binman/README.rst | 1 + tools/binman/{README => binman.rst} | 959 ++++++++++++++++++++++------------------ tools/binman/cmdline.py | 5 +- tools/binman/control.py | 28 +- tools/binman/{README.entries => entries.rst} | 336 ++++++++++---- tools/binman/entry.py | 73 ++- tools/binman/entry_test.py | 12 + tools/binman/etype/atf_bl31.py | 2 +- tools/binman/etype/blob.py | 4 +- tools/binman/etype/blob_dtb.py | 9 - tools/binman/etype/blob_ext.py | 2 +- tools/binman/etype/blob_phase.py | 51 +++ tools/binman/etype/cbfs.py | 12 +- tools/binman/etype/fdtmap.py | 30 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fit.py | 21 +- tools/binman/etype/intel_cmc.py | 2 +- tools/binman/etype/intel_fsp.py | 2 +- tools/binman/etype/intel_fsp_m.py | 2 +- tools/binman/etype/intel_fsp_s.py | 2 +- tools/binman/etype/intel_fsp_t.py | 2 +- tools/binman/etype/intel_ifwi.py | 10 +- tools/binman/etype/intel_me.py | 2 +- tools/binman/etype/intel_mrc.py | 2 +- tools/binman/etype/intel_refcode.py | 2 +- tools/binman/etype/intel_vbt.py | 2 +- tools/binman/etype/intel_vga.py | 2 +- tools/binman/etype/mkimage.py | 4 +- tools/binman/etype/scp.py | 2 +- tools/binman/etype/section.py | 15 +- tools/binman/etype/text.py | 6 +- tools/binman/etype/u_boot.py | 8 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 4 +- tools/binman/etype/u_boot_expanded.py | 24 + tools/binman/etype/u_boot_nodtb.py | 8 +- tools/binman/etype/u_boot_spl.py | 3 + tools/binman/etype/u_boot_spl_bss_pad.py | 17 +- tools/binman/etype/u_boot_spl_expanded.py | 45 ++ tools/binman/etype/u_boot_spl_nodtb.py | 24 +- tools/binman/etype/u_boot_tpl.py | 3 + tools/binman/etype/u_boot_tpl_bss_pad.py | 44 ++ tools/binman/etype/u_boot_tpl_expanded.py | 45 ++ tools/binman/etype/u_boot_tpl_nodtb.py | 42 ++ tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/ftest.py | 268 ++++++++++-- tools/binman/image.py | 17 +- tools/binman/index.rst | 9 + tools/binman/setup.py | 2 +- tools/binman/state.py | 71 +-- tools/binman/test/053_symbols.dts | 2 +- tools/binman/test/149_symbols_tpl.dts | 1 - tools/binman/test/155_symbols_tpl_x86.dts | 1 - tools/binman/test/192_symbols_nodtb.dts | 26 ++ tools/binman/test/192_u_boot_tpl_nodtb.dts | 13 + tools/binman/test/193_tpl_bss_pad.dts | 19 + tools/binman/test/194_fdt_incl.dts | 17 + tools/binman/test/195_fdt_incl_tpl.dts | 13 + tools/binman/test/u_boot_binman_syms.c | 2 +- tools/dtoc/dtb_platdata.py | 620 +++++++++++++++++++++++--- tools/dtoc/dtoc_test_scan_drivers.cxx | 1 - tools/dtoc/main.py | 9 +- tools/dtoc/src_scan.py | 597 ++++++++++++++++++++++++- tools/dtoc/{ => test}/dtoc_test.dts | 0 tools/dtoc/{ => test}/dtoc_test_add_prop.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr32.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr32_64.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr64.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr64_32.dts | 0 tools/dtoc/test/dtoc_test_alias_bad.dts | 58 +++ tools/dtoc/test/dtoc_test_alias_bad_path.dts | 58 +++ tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 58 +++ tools/dtoc/{ => test}/dtoc_test_aliases.dts | 0 tools/dtoc/{ => test}/dtoc_test_bad_reg.dts | 0 tools/dtoc/{ => test}/dtoc_test_bad_reg2.dts | 0 tools/dtoc/{ => test}/dtoc_test_driver_alias.dts | 0 tools/dtoc/{ => test}/dtoc_test_empty.dts | 0 tools/dtoc/test/dtoc_test_inst.dts | 58 +++ tools/dtoc/{ => test}/dtoc_test_invalid_driver.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle_bad.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle_bad2.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle_cd_gpios.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle_reorder.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle_single.dts | 0 tools/dtoc/test/dtoc_test_scan_drivers.cxx | 5 + tools/dtoc/{ => test}/dtoc_test_simple.dts | 4 +- tools/dtoc/test_dtoc.py | 1023 ++++++++++++++++++++++++++++++++++++++++--- tools/dtoc/test_fdt.py | 31 +- tools/dtoc/test_src_scan.py | 397 ++++++++++++++++- tools/fdtgrep.c | 2 +- tools/patman/README | 14 +- tools/patman/func_test.py | 2 +- tools/patman/gitutil.py | 45 +- tools/patman/main.py | 9 +- tools/patman/series.py | 10 +- tools/patman/tools.py | 8 +- 191 files changed, 6510 insertions(+), 1533 deletions(-) create mode 100644 configs/sandbox_noinst_defconfig rename doc/{ => develop}/driver-model/bind.rst (100%) rename doc/{ => develop}/driver-model/debugging.rst (100%) rename doc/{ => develop}/driver-model/design.rst (100%) rename doc/{ => develop}/driver-model/ethernet.rst (100%) rename doc/{ => develop}/driver-model/fdt-fixup.rst (100%) rename doc/{ => develop}/driver-model/fs_firmware_loader.rst (100%) rename doc/{ => develop}/driver-model/i2c-howto.rst (100%) rename doc/{ => develop}/driver-model/index.rst (68%) rename doc/{ => develop}/driver-model/livetree.rst (100%) rename doc/{ => develop}/driver-model/migration.rst (100%) create mode 100644 doc/develop/driver-model/of-plat.rst rename doc/{ => develop}/driver-model/pci-info.rst (99%) rename doc/{ => develop}/driver-model/pmic-framework.rst (100%) rename doc/{ => develop}/driver-model/remoteproc-framework.rst (100%) rename doc/{ => develop}/driver-model/serial-howto.rst (100%) rename doc/{ => develop}/driver-model/soc-framework.rst (100%) rename doc/{ => develop}/driver-model/spi-howto.rst (100%) rename doc/{ => develop}/driver-model/usb-info.rst (100%) create mode 120000 doc/develop/package/binman.rst create mode 120000 doc/develop/package/entries.rst create mode 100644 doc/develop/package/index.rst rename doc/{ => develop}/uefi/index.rst (51%) rename doc/{ => develop}/uefi/iscsi.rst (100%) rename doc/{ => develop}/uefi/u-boot_on_efi.rst (100%) rename doc/{ => develop}/uefi/uefi.rst (100%) delete mode 100644 doc/driver-model/of-plat.rst create mode 100644 doc/usage/fit.rst create mode 120000 tools/binman/README.rst rename tools/binman/{README => binman.rst} (64%) rename tools/binman/{README.entries => entries.rst} (82%) create mode 100644 tools/binman/etype/blob_phase.py create mode 100644 tools/binman/etype/u_boot_expanded.py create mode 100644 tools/binman/etype/u_boot_spl_expanded.py create mode 100644 tools/binman/etype/u_boot_tpl_bss_pad.py create mode 100644 tools/binman/etype/u_boot_tpl_expanded.py create mode 100644 tools/binman/etype/u_boot_tpl_nodtb.py create mode 100644 tools/binman/index.rst create mode 100644 tools/binman/test/192_symbols_nodtb.dts create mode 100644 tools/binman/test/192_u_boot_tpl_nodtb.dts create mode 100644 tools/binman/test/193_tpl_bss_pad.dts create mode 100644 tools/binman/test/194_fdt_incl.dts create mode 100644 tools/binman/test/195_fdt_incl_tpl.dts delete mode 100644 tools/dtoc/dtoc_test_scan_drivers.cxx rename tools/dtoc/{ => test}/dtoc_test.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_add_prop.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr32.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr32_64.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr64.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr64_32.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_alias_bad.dts create mode 100644 tools/dtoc/test/dtoc_test_alias_bad_path.dts create mode 100644 tools/dtoc/test/dtoc_test_alias_bad_uc.dts rename tools/dtoc/{ => test}/dtoc_test_aliases.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_bad_reg.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_bad_reg2.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_driver_alias.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_empty.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_inst.dts rename tools/dtoc/{ => test}/dtoc_test_invalid_driver.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_bad.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_bad2.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_cd_gpios.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_reorder.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_single.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_scan_drivers.cxx rename tools/dtoc/{ => test}/dtoc_test_simple.dts (93%) Regards, Simon

1 0

[PATCH] driver: spi: renesas_rpc_spi: Add mem_ops
by zhengxun 22 Mar '21

22 Mar '21

This patch adds an implementation of exec_op, which support octal mode and quad mode for reading flash and support existing single mode for reading and writing flash concurrently. Signed-off-by: zhengxun <zhengxunli.mxic(a)gmail.com> --- drivers/spi/renesas_rpc_spi.c | 144 ++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 26b6aa85c9..b317995dae 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -17,6 +17,7 @@ #include <linux/bug.h> #include <linux/errno.h> #include <spi.h> +#include <spi-mem.h> #include <wait_bit.h> #define RPC_CMNCR 0x0000 /* R/W */ @@ -368,6 +369,144 @@ err: return ret; } +static int rpc_spi_exec_mem_op(struct spi_slave *slave, + const struct spi_mem_op *op) +{ + struct rpc_spi_priv *priv; + struct udevice *bus; + u32 wloop = (op->data.dir == SPI_MEM_DATA_OUT) ? + DIV_ROUND_UP(op->data.nbytes, 4) : 0; + u32 smenr, smcr, cmncr; + u32 *datout; + int ret = 0; + + bus = slave->dev->parent; + priv = dev_get_priv(bus); + + if (op->cmd.buswidth == 2 || op->addr.buswidth == 2 || + op->data.buswidth == 2 || op->addr.nbytes > 4) + return -ENOTSUPP; + + smenr = 0; + + if (op->data.dir == SPI_MEM_DATA_OUT || + op->data.dir == SPI_MEM_NO_DATA) { + rpc_spi_claim_bus(slave->dev, true); + + writel(0, priv->regs + RPC_SMCR); + + /* Commnad(1) */ + writel(RPC_SMCMR_CMD(op->cmd.opcode), priv->regs + RPC_SMCMR); + + smenr |= RPC_SMENR_CDE; + + smenr |= RPC_SMENR_CDB(fls(op->cmd.buswidth) - 1); + + /* Address(3 or 4) */ + if (op->addr.nbytes) { + writel(op->addr.val, priv->regs + RPC_SMADR); + if (op->addr.nbytes == 3) + smenr |= RPC_SMENR_ADE(0x7); + else + smenr |= RPC_SMENR_ADE(0xf); + smenr |= RPC_SMENR_ADB(fls(op->addr.buswidth) - 1); + } else { + writel(0, priv->regs + RPC_SMADR); + } + + /* Dummy(0) */ + writel(0, priv->regs + RPC_SMDMCR); + + writel(0, priv->regs + RPC_SMOPR); + + writel(0, priv->regs + RPC_SMDRENR); + + /* Data(n) */ + if (op->data.nbytes) { + datout = (u32 *)op->data.buf.out; + + smenr |= RPC_SMENR_SPIDE(0xf); + + smenr |= RPC_SMENR_SPIDB(fls(op->data.buswidth) - 1); + + while (wloop--) { + smcr = RPC_SMCR_SPIWE | RPC_SMCR_SPIE; + if (wloop >= 1) + smcr |= RPC_SMCR_SSLKP; + writel(smenr, priv->regs + RPC_SMENR); + writel(*datout, priv->regs + RPC_SMWDR0); + writel(smcr, priv->regs + RPC_SMCR); + ret = rpc_spi_wait_tend(slave->dev); + if (ret) + goto err; + datout++; + smenr = RPC_SMENR_SPIDE(0xf); + } + + ret = rpc_spi_wait_sslf(slave->dev); + } else { + writel(smenr, priv->regs + RPC_SMENR); + writel(RPC_SMCR_SPIE, priv->regs + RPC_SMCR); + ret = rpc_spi_wait_tend(slave->dev); + } + } else { /* Read data only, using DRx ext access */ + rpc_spi_claim_bus(slave->dev, false); + + if (op->cmd.buswidth > 4 || op->addr.buswidth > 4 || + op->data.buswidth > 4) { + cmncr = readl(priv->regs + RPC_CMNCR); + cmncr |= RPC_CMNCR_BSZ(1); + writel(cmncr, priv->regs + RPC_CMNCR); + } + + /* Command(1) */ + writel(RPC_DRCMR_CMD(op->cmd.opcode), priv->regs + RPC_DRCMR); + + smenr |= RPC_DRENR_CDE; + + smenr |= RPC_DRENR_CDB(fls(op->cmd.buswidth) - 1); + + /* Address(3 or 4) */ + if (op->addr.nbytes) { + if (op->addr.nbytes == 3) + smenr |= RPC_DRENR_ADE(0x7); + else + smenr |= RPC_DRENR_ADE(0xf); + smenr |= RPC_DRENR_ADB(fls(op->addr.buswidth) - 1); + } + + /* Dummy(n) */ + if (op->dummy.nbytes) { + writel(op->dummy.nbytes, priv->regs + RPC_DRDMCR); + smenr |= RPC_DRENR_DME; + } else { + writel(0, priv->regs + RPC_DRDMCR); + } + + writel(0, priv->regs + RPC_DROPR); + + if (op->data.buswidth > 4) + smenr |= RPC_DRENR_SPIDB(2); + else + smenr |= RPC_DRENR_SPIDB(fls(op->data.buswidth) - 1); + + writel(smenr, priv->regs + RPC_DRENR); + + if (op->data.nbytes) { + memcpy_fromio(op->data.buf.in, + (void *)(priv->extr + op->addr.val), + op->data.nbytes); + } else { + readl(priv->extr); /* Dummy read */ + } + } + +err: + rpc_spi_release_bus(slave->dev); + + return ret; +} + static int rpc_spi_set_speed(struct udevice *bus, uint speed) { /* This is a SPI NOR controller, do nothing. */ @@ -442,10 +581,15 @@ static int rpc_spi_of_to_plat(struct udevice *bus) return 0; } +static const struct spi_controller_mem_ops rpc_spi_mem_ops = { + .exec_op = rpc_spi_exec_mem_op, +}; + static const struct dm_spi_ops rpc_spi_ops = { .xfer = rpc_spi_xfer, .set_speed = rpc_spi_set_speed, .set_mode = rpc_spi_set_mode, + .mem_ops = &rpc_spi_mem_ops, }; static const struct udevice_id rpc_spi_ids[] = { -- 2.17.1

1 0

[PATCH] dm: test: Always include command.h for print_ut
by Sean Anderson 22 Mar '21

22 Mar '21

We need this header for U_BOOT_CMD, which is always present even without EFI. Fixes: 82c468a049 dm: test: Update Makefile conditions Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- test/print_ut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/print_ut.c b/test/print_ut.c index a456a449ef..61ea432e46 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -6,8 +6,8 @@ #define DEBUG #include <common.h> -#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) #include <command.h> +#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) #include <efi_api.h> #endif #include <display_options.h> -- 2.30.1

2 1

[PATCH] azure: Use --board flag with sandbox_spl
by Simon Glass 22 Mar '21

22 Mar '21

At present there is only one board which uses sandbox SPL. But with sandbox_noinst being added, this is no longer true. Add a --board flag so that we just build one board on azure, as is done in gitlab. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2d0b9cb469a..ec2f2609973 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -148,7 +148,7 @@ jobs: export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} - ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w sandbox_spl + ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board sandbox_spl ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t -- 2.31.0.rc2.261.g7f71774620-goog

2 2

[PATCH 1/2] mx23_olinuxino: enable device tree
by Trevor Woerner 22 Mar '21

22 Mar '21

Add the dts file for the Olimex Olinuxino from the linux kernel, and enable its use in this machine's defconfig. Signed-off-by: Trevor Woerner <twoerner(a)gmail.com> --- arch/arm/dts/Makefile | 3 + arch/arm/dts/imx23-olinuxino.dts | 131 +++++++++++++++++++++++++++++++ configs/mx23_olinuxino_defconfig | 3 +- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx23-olinuxino.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c6710826a0..d5cffc90d4 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -651,6 +651,9 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ dtb-$(CONFIG_MX23) += \ imx23-evk.dtb +dtb-$(CONFIG_TARGET_MX23_OLINUXINO) += \ + imx23-olinuxino.dtb + dtb-$(CONFIG_MX28) += \ imx28-xea.dtb diff --git a/arch/arm/dts/imx23-olinuxino.dts b/arch/arm/dts/imx23-olinuxino.dts new file mode 100644 index 0000000000..0729e72f22 --- /dev/null +++ b/arch/arm/dts/imx23-olinuxino.dts @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright 2012 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam <fabio.estevam(a)freescale.com> + */ + +/dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include "imx23.dtsi" + +/ { + model = "i.MX23 Olinuxino Low Cost Board"; + compatible = "olimex,imx23-olinuxino", "fsl,imx23"; + + memory@40000000 { + device_type = "memory"; + reg = <0x40000000 0x04000000>; + }; + + apb@80000000 { + apbh@80000000 { + ssp0: spi@80010000 { + compatible = "fsl,imx23-mmc"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>; + bus-width = <4>; + broken-cd; + status = "okay"; + }; + + pinctrl@80018000 { + pinctrl-names = "default"; + pinctrl-0 = <&hog_pins_a>; + + hog_pins_a: hog@0 { + reg = <0>; + fsl,pinmux-ids = < + MX23_PAD_GPMI_ALE__GPIO_0_17 + >; + fsl,drive-strength = <MXS_DRIVE_4mA>; + fsl,voltage = <MXS_VOLTAGE_HIGH>; + fsl,pull-up = <MXS_PULL_DISABLE>; + }; + + led_pin_gpio2_1: led_gpio2_1@0 { + reg = <0>; + fsl,pinmux-ids = < + MX23_PAD_SSP1_DETECT__GPIO_2_1 + >; + fsl,drive-strength = <MXS_DRIVE_4mA>; + fsl,voltage = <MXS_VOLTAGE_HIGH>; + fsl,pull-up = <MXS_PULL_DISABLE>; + }; + }; + + ssp1: spi@80034000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx23-spi"; + pinctrl-names = "default"; + pinctrl-0 = <&spi2_pins_a>; + status = "okay"; + }; + }; + + apbx@80040000 { + lradc@80050000 { + status = "okay"; + }; + + i2c: i2c@80058000 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c_pins_b>; + status = "okay"; + }; + + duart: serial@80070000 { + pinctrl-names = "default"; + pinctrl-0 = <&duart_pins_a>; + status = "okay"; + }; + + auart0: serial@8006c000 { + pinctrl-names = "default"; + pinctrl-0 = <&auart0_2pins_a>; + status = "okay"; + }; + + usbphy0: usbphy@8007c000 { + status = "okay"; + }; + }; + }; + + ahb@80080000 { + usb0: usb@80080000 { + dr_mode = "host"; + vbus-supply = <&reg_usb0_vbus>; + status = "okay"; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_usb0_vbus: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb0_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */ + gpio = <&gpio0 17 0>; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pin_gpio2_1>; + + user { + label = "green"; + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + }; + }; +}; diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 0da54c9e76..2bf6818ee3 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x00001000 CONFIG_TARGET_MX23_OLINUXINO=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="imx23-olinuxino" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y @@ -24,6 +25,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -44,4 +46,3 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_OF_LIBFDT=y -- 2.30.0.rc0

3 3

[PATCH v6 0/2] gpio: Update and simplify the uclass API
by Simon Glass 22 Mar '21

22 Mar '21

At present the GPIO uclass mirrors what was in U-Boot before driver model. It works well in most cases but is becoming cumbersome with things like pull-up/down and drive strength. In those cases it is easier for the driver to deal with all the flags at one, rather than piece by piece. In fact the current API does not officially have a method for adjusting anything other than the direction flags. While set_dir_flags() and get_dir_flags() do in fact support changing other flags, this is not documented. Secondly, set_dir_flags actually ORs the current flags with the new ones so it is not possible to clear flags. It seems better to use a clr/set interface (bit clear followed by OR) to provide more flexibility. Finally, direction_input() and direction_output() are really just the same thing as set_dir_flags(), with a different name. We currently use the latter if available, failing back to the former. But it makes sense to deprecate the old methods. This series makes the above changes. Existing drivers are mostly left alone, since they should continue to operate as is. The sandbox driver is updated to add the required new tests and the x86 driver is switched over to the new API. The STM32 driver should be checked to make sure the open source/open drain features still work as intended. Changes in v6: - Use dm_gpio_clrset_flags() so that direction can be changed - Simplify the code since masking is not needed Changes in v5: - Drop patches previously applied Simon Glass (2): gpio: i2c-gpio: Drop use of dm_gpio_set_dir() gpio: Drop dm_gpio_set_dir() drivers/gpio/gpio-uclass.c | 11 ----------- drivers/i2c/i2c-gpio.c | 19 +++++++++---------- include/asm-generic/gpio.h | 11 ----------- 3 files changed, 9 insertions(+), 32 deletions(-) -- 2.31.0.rc2.261.g7f71774620-goog

2 3

[PATCH 0/2] riscv: simply longjmp()
by Heinrich Schuchardt 22 Mar '21

22 Mar '21

The implementation of longjmp() is simplified. A unit test for longjmp() is provided. For testing use CONFIG_UNIT_TEST=y CONFIG_CMD_SETEXPR=n and execute ut lib Heinrich Schuchardt (2): riscv: simply longjmp test: unit test for longjmp arch/riscv/lib/setjmp.S | 8 ++------ test/lib/Makefile | 1 + test/lib/longjmp.c | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 test/lib/longjmp.c -- 2.30.2

2 4