December 2021 - U-Boot

[PATCH] Enable USB mass storage on Renegade
by Leonidas P. Papadakos 14 Mar '22

14 Mar '22

This is very useful to access the LibreComputer eMMC as removable storage from a PC (e.g. like so `ums 0 mmc 0`). It has been tested as working on my Renegade board. Signed-off-by: Leonidas P. Papadakos <papadakospan(a)gmail.com> --- configs/roc-cc-rk3328_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig index cf04bbc768..e3e40a6d64 100644 --- a/configs/roc-cc-rk3328_defconfig +++ b/configs/roc-cc-rk3328_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y -- 2.34.1

2 1

[PATCH v10 0/9] env: Allow environment in text files
by Simon Glass 12 Mar '22

12 Mar '22

One barrier to completing the 7-year-long Kconfig migration is that the default environment is implemented using ad-hoc CONFIG options. At present U-Boot environment variables, and thus scripts, are defined by CONFIG_EXTRA_ENV_SETTINGS. It is not really feasible to move the environment to Kconfig as it is hundreds of lines of text in some cases. Even considering the current situation, it is painful to add large amounts of text to the config-header file and dealing with quoting and newlines is harder than it should be. It would be better if we could just type the script into a text file and have it included by U-Boot. This is already supported by the CONFIG_USE_DEFAULT_ENV_FILE feature. but that does not support use of CONFIG options or comments, so is best suited for use by other build systems wanting to define the U-Boot environment. Add a feature that brings in a .env file associated with the board config, if present. To use it, create a file board/<vendor>/<board>.env or use CONFIG_ENV_SOURCE_FILE to set a filename. The environment variables should be of the form "var=value". Values can extend to multiple lines. This series converts the existing environment documentation to rST and updates it to explain how to use this. Note: this series was originally sent eight years ago: https://patchwork.ozlabs.org/project/uboot/patch/1382763695-2849-4-git-send… It has been updated to work with Kconfig, etc. Some review comments in that patch were infeasible so I have not addressed them. I would like this series to be considered independently, on its merits. Rather than deal with the complexity of rewriting the distro-boot script, this is disabled for sandbox. The forthcoming bootmethod approach should provide the same functionality without needing the complex scripting in the environment. Migration needs more thought, although it can be done later. It may be possible to do migrate automatically, using buildman to extract the built-in environmnent from the ELF file. This would produce a pretty ugly conversion though, since it would drop all the intermediate variables used to create the environment. Better would be to parse the config.h file, figure out the components of CONFIG_EXTRA_ENV_SETTINGS then output these as separate pieces in the file. It is not clear how easy that would be, nor whether the result would be very pretty. Also the __stringify() macro needs to be handled somehow. This series is available at u-boot-dm/env-working Comments welcome. Changes in v10: - Use backslash to allow assignment to a variable ending in + - Add rST file into the index - Minor tweaks to the script's pattern matching - Add updates as suggested by Heinrich - Add new patch to update the test MAC/IP addresses Changes in v9: - Drop mention of other strange characters - Clarify that the + restriction is on the variable name not its value - Add some tests for the script - Deal with leading tabs - Squash indentation down to one space - Convert newlines within strings to spaces, which seems more consistent - Handle appending an empty string to an empty var - Fix blank line between tags - Fix typo in commit message - More bikeshedding on env_get_autostart() - Fix '<vendor><board>' in cover letter - Use env_get_yesno() in env_get_autostart() and update docs Changes in v8: - Update commit message to avoid mentioning the 'env' subdirectory - Update commit message to mention the + restriction, etc. - Overwrite the env file each time, to avoid incremental-build problems - Fix ambiguity about what is ignored - Go into more detail about the change of behaviour with autostart Changes in v7: - Use 'env' basename instead of 'environment' for intermediate output files - Show a message indicating the source text file being used - Give an error if CONFIG_EXTRA_ENV_SETTINGS is also defined - Use CONFIG_ENV_SOURCE_FILE instead of rules to specify the text-file name - Make board.env the default name if CONFIG_ENV_SOURCE_FILE is empty - Rewrite the documentation - Drop the use of common.env - Update awk script to output the whole CONFIG string, or just a comment - Add new patch to explain the relationship with DEFAULT_ENV_FILE - A few more tweaks - Update the cover letter Changes in v6: - Move all updates to a separate patch - Combine the two env2string.awk patches into one - Move all updates to a separate patch - More updates and improvements - Add new patch to tidy up use of autostart env var Changes in v5: - Minor updates as suggested by Wolfgang - Explain how to include the common.env file - Explain why variables starting with _ , and / are not supported - Expand the definition of how to declare an environment variable - Explain what happens to empty variables - Update maintainer - Move use of += to this patch - Explain that environment variables may not end in + - Minor updates as suggested by Wolfgang Changes in v4: - Add new patch to move environment documentation to rST - Move this from being part of configuring U-Boot to part of building it - Don't put the environment in autoconf.mk as it is not needed - Add documentation in rST format instead of README - Drop mention of import/export - Update awk script to ignore blank lines, as generated by clang - Add documentation in rST format instead of README - Add new patch to move environment documentation to rST Changes in v3: - Adjust Makefile to generate the .inc and .h files in separate fules - Add more detail in the README about the format of .env files - Improve the comment about " in the awk script - Correctly terminate environment files with \n - Define __UBOOT_CONFIG__ when collecting environment files - Add new patch to use a text-based environment for sandbox Changes in v2: - Move .env file from include/configs to board/ - Use awk script to process environment since it is much easier on the brain - Add information and updated example script to README - Add dependency rule so that the environment is rebuilt when it changes - Add separate patch to enable C preprocessor for environment files - Enable var+=value form to simplify composing variables in multiple steps Simon Glass (9): sandbox: Drop distro_boot doc: Move environment documentation to rST env: Allow U-Boot scripts to be placed in a .env file sandbox: Use a text-based environment doc: Mention CONFIG_DEFAULT_ENV_FILE doc: Improve environment documentation doc: Improve environment documentation further sandbox: Update the test MAC/IP addresses bootm: Tidy up use of autostart env var MAINTAINERS | 7 + Makefile | 66 ++++- README | 328 ------------------------- board/sandbox/sandbox.env | 25 ++ cmd/bootm.c | 4 +- cmd/elf.c | 3 +- common/bootm_os.c | 5 +- config.mk | 2 + doc/develop/environment.rst | 51 ++++ doc/develop/index.rst | 1 + doc/usage/environment.rst | 465 ++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 2 + env/Kconfig | 18 ++ env/common.c | 5 + env/embedded.c | 1 + include/configs/sandbox.h | 40 ---- include/env.h | 7 + include/env_default.h | 11 + scripts/env2string.awk | 80 +++++++ test/py/tests/test_env.py | 107 +++++++++ 20 files changed, 850 insertions(+), 378 deletions(-) create mode 100644 board/sandbox/sandbox.env create mode 100644 doc/develop/environment.rst create mode 100644 doc/usage/environment.rst create mode 100644 scripts/env2string.awk -- 2.33.0.1079.g6e70778dc9-goog

7 23

[PATCH v1] MAINTAINERS: add rockchip regex for more files and directories
by Johan Jonker 12 Mar '22

12 Mar '22

The current files and directories with wildcard patterns for Rockchip patches in MAINTAINERS is not always complete. Add the regex for DT related files and a generic regex for catching some other forgotten cases, so that the maintainers receive all Rockchip related patches. Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 90666ce3..75224d05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -366,6 +366,9 @@ M: Philipp Tomsich <philipp.tomsich(a)vrull.eu> M: Kever Yang <kever.yang(a)rock-chips.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-rockchip.git +F: arch/arm/dts/rk3* +F: arch/arm/dts/rockchip* +F: arch/arm/dts/rv1108* F: arch/arm/include/asm/arch-rockchip/ F: arch/arm/mach-rockchip/ F: board/rockchip/ @@ -383,6 +386,7 @@ F: tools/rkcommon.h F: tools/rkimage.c F: tools/rksd.c F: tools/rkspi.c +N: rockchip ARM SAMSUNG M: Minkyu Kang <mk7.kang(a)samsung.com> -- 2.20.1

4 3

[PATCH][RFC] image: fdt: Fix DT relocation handling with multiple DRAM banks with gap
by Marek Vasut 12 Mar '22

12 Mar '22

The current implementation of boot_relocate_fdt() places DT at the highest usable DRAM address, which is calculated as: env_get_bootm_low() + env_get_bootm_mapsize() which by default becomes gd->ram_base + gd->ram_size. Systems like i.MX53 can have multiple DRAM banks with gap between them, e.g. have DRAM at 0x70000000-0x8fffffff and 0xb0000000-0xcfffffff , so for them the calculated highest DRAM address is 0xafffffff, which is exactly in the gap and thus not usable. Fix this by iterating over all DRAM banks and tracking the remaining amount of the total mapping size obtained from env_get_bootm_mapsize(). Limit the maximum LMB area size to each bank, to avoid using nonexistent DRAM. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- common/image-fdt.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 327a8c4c395..2b199ffc2b1 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -157,8 +157,11 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) { void *fdt_blob = *of_flat_tree; void *of_start = NULL; + u64 start, size, usable; char *fdt_high; + ulong mapsize, low; ulong of_len = 0; + int bank; int err; int disable_relocation = 0; @@ -198,10 +201,39 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) (void *)(ulong) lmb_alloc(lmb, of_len, 0x1000); } } else { - of_start = - (void *)(ulong) lmb_alloc_base(lmb, of_len, 0x1000, - env_get_bootm_mapsize() - + env_get_bootm_low()); + mapsize = env_get_bootm_mapsize(); + low = env_get_bootm_low(); + of_start = NULL; + + for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) { + start = gd->bd->bi_dram[bank].start; + size = gd->bd->bi_dram[bank].size; + + /* DRAM bank addresses are too low, skip it. */ + if (start + size < low) + continue; + + usable = min(size, (u64)mapsize); + + /* + * At least part of this DRAM bank is usable, try + * using it for LMB allocation. + */ + of_start = + (void *)(ulong) lmb_alloc_base(lmb, of_len, 0x1000, + start + usable); + /* Allocation succeeded, use this block. */ + if (of_start != NULL) + break; + + /* + * Reduce the mapping size in the next bank + * by the size of attempt in current bank. + */ + mapsize -= usable - max(start, (u64)low); + if (!mapsize) + break; + } } if (of_start == NULL) { -- 2.30.2

2 4

[PATCH] fit: display proper node on error
by Angelo Dureghello 12 Mar '22

12 Mar '22

Fix final error message from Verification failed for '<NULL>' hash node in 'conf@1' config node to Verification failed for 'signature@1' hash node in 'conf@1' config node Signed-off-by: Angelo Dureghello <angelo.dureghello(a)timesys.com> --- common/image-fit-sig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c index b979cd2a4b..4f2a6ef214 100644 --- a/common/image-fit-sig.c +++ b/common/image-fit-sig.c @@ -166,8 +166,8 @@ static int fit_image_verify_sig(const void *fit, int image_noffset, } else { puts("+ "); verified = 1; - break; } + break; } } -- 2.32.0

3 4

two questions on verified boot
by Rasmus Villemoes 12 Mar '22

12 Mar '22

(1) When one wants to get rid of CONFIG_LEGACY_IMAGE_FORMAT, one also has to wrap any boot script in a FIT rather than a uImage. While it's not directly documented anywhere how to do that, it seems that a minimal .its for achieving it is /dts-v1/; / { description = "U-Boot script(s)"; images { default = "boot"; boot { description = "Bootscript"; data = /incbin/("boot.txt"); type = "script"; compression = "none"; hash-1 { algo = "sha256"; }; }; }; }; [The UX when one doesn't guess that the description string is mandatory is rather sad, but that's a separate story.] Now, I can get that signed if I include a signature-foo node inside the "boot" node, and also add a dummy empty /configurations node (otherwise mkimage refuses to process it). But that will only work if I have added a "required = image" property with the public key; if I want to use the safer/saner "required = conf", how do I make sure any boot script is properly signed? The code in source.c only cares about the images node and calls fit_image_verify(), and there's no concept of "configuration" and combining multiple images when talking about a simple boot script. (2) Assuming for the moment that I would be happy with just using required=image, am I right in that not only does that mean that the combination of kernel/fdt/initramfs is not verified, merely the individual parts, but more importantly (a mix'n'match attack isn't really very likely), _only_ the data property in each node is part of what gets signed, not the other important properties such as load= and entry=? IOW, suppose I have a FIT image with images { kernel { data = blabla; load = 0x1000000; entry = 0x10000000; signature { ... // correct signature of blabla }; }; }; and I know that the boot process uses $loadaddr = 0x40000000. What is to stop me from modifying that FIT image to read images { kernel { data = blabla; load = 0x1000000; entry = 0x400abcde; signature { ... // correct signature of blabla }; }; }; some-other-node { pwned = /incbin/("pwned"); }; where 0xabcde is chosen to coincide with where the data part of the pwned property lies in the modified FIT? (That pwned property can be put anywhere; I could even just replace the signer-name property inside the signature node with a value of "mkimage\0<padding><my payload>".) In fit_config_process_sig(), there's this elaborate dance with fit_config_get_data()/fdt_find_regions() which, AFAICT, ends up including all the property values (and the FDT_PROP tags and string offsets etc.), and then we call info.crypto->sign() with some appropriate region_count. But in fit_image_process_sig(), we call info.crypto->sign() with nregions==1, and AFAICT, the data being signed is just the value of the "data" property, nothing else. Rasmus

3 4

[PATCH v2 00/41] Initial implementation of standard boot
by Simon Glass 12 Mar '22

12 Mar '22

The bootflow feature provide a built-in way for U-Boot to automatically boot an Operating System without custom scripting and other customisation. This is called 'standard boot' since it provides a standard way for U-Boot to boot a distro, without scripting. It introduces the following concepts: - bootdev - a device which can hold a distro - bootmeth - a method to scan a bootdev to find bootflows (owned by U-Boot) - bootflow - a description of how to boot (owned by the distro) This series provides an implementation of these, enabled to scan for bootflows from MMC, USB and Ethernet. It supports the existing distro boot as well as the EFI loader flow (bootefi/bootmgr). It works similiarly to the existing script-based approach, but is native to U-Boot. With this we can boot on a Raspberry Pi 3 with just one command: bootflow scan -lb which means to scan, listing (-l) each bootflow and trying to boot each one (-b). The final patch shows this. With a standard way to identify boot devices, booting become easier. It also should be possible to support U-Boot scripts, for backwards compatibility only. This series relies on the PXE clean-up series, posted here: https://patchwork.ozlabs.org/project/uboot/list/?series=267078 For documentation, see the 'doc' patch. For version 2, a new naming scheme is used as above: - bootdev is used instead of bootdevice, because 'device' is overused, is everywhere in U-Boot, can be confused with udevice - bootmeth - because 'method' is too vanilla, appears 1300 times in U-Boot Also in version 2, drivers are introduced for the boot methods, to make it more extensible. Booting a custom OS is simply a matter of creating a bootmeth for it and implementing the read_file() and boot() methods. The design is described in these two documents: https://drive.google.com/file/d/1ggW0KJpUOR__vBkj3l61L2dav4ZkNC12/view?usp=… https://drive.google.com/file/d/1kTrflO9vvGlKp-ZH_jlgb9TY3WYG6FF9/view?usp=… The series is available at u-boot-dm/bme-working Sample log on rpi_3_32b: U-Boot 2021.10-rc2-00043-gccd453aa918-dirty (Aug 28 2021 - 13:58:46 -0600) DRAM: 992 MiB RPI 3 Model B (0xa22082) MMC: mmc@7e202000: 0, sdhci@7e300000: 1 Loading Environment from FAT... Unable to read "uboot.env" from mmc0:1... In: serial Out: vidconsole Err: vidconsole Net: No ethernet found. starting USB... Bus usb@7e980000: USB DWC2 scanning bus usb@7e980000 for devices... usb_kbd usb_kbd: Timeout poll on interrupt endpoint Failed to get keyboard state from device 0c40:8000 4 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 Scanning for bootflows in all bootmethods Seq Type State Uclass Part Name Filename --- ----------- ------ -------- ---- ------------------------ ---------------- Scanning bootmethod 'mmc(a)7e202000.bootmethod': 0 efi-loader loaded mmc 1 mmc(a)7e202000.bootmethod.p efi/boot/bootarm.efi ** Booting bootflow 'mmc(a)7e202000.bootmethod.part_1' Scanning disk mmc(a)7e202000.blk... ** Unrecognized filesystem type ** Card did not respond to voltage select! : -110 Scanning disk sdhci(a)7e300000.blk... Disk sdhci(a)7e300000.blk not ready Found 4 disks No EFI system partition Booting /efi\boot Waiting for Ethernet connection... done. Fedora (5.11.12-300.fc34.armv7hl) 34 (Workstation Edition) UEFI Firmware Settings Use the ▲ and ▼ keys to change the selection. Press 'e' to edit the selected item, or 'c' for a command prompt. Press Escape to return to the previous menu. The selected entry will be started automatically in 0s. Changes in v2: - Free the memory buffer, to avoid running out of memory - Unmap the file - Reorder struct sandbox_mmc_priv Simon Glass (41): lib: Add a way to find the postiion of a trailing number Makefile: Allow LTO to be disabled for a build test/py: Allow passing input to a program sandbox: Support unmapping a file sandbox: mmc: Support a backing file mmc: Allow for children other than the block device mbr: Correct verification check disk: part_dos: Fix a NULL pointer error common: Allow a smaller console-recording pre-reloc dm: core: Add tests for stringlist functions dm: core: Fix handling of uclass pre_unbind method dm: core: Fix up string-function documentation dm: core: Add a way to obtain a string list dm: core: Allow finding children / uclasses by partial name dm: core: Add a way to count the devices in a uclass sandbox: Enable HEXDUMP for sandbox_flattree test/py: Relax the naming rules for unit tests test/py: Raise a ValueError if a command fails bootstd: Add the concept of a bootflow bootstd: Add the bootstd uclass and core implementation bootstd: Add the bootdev uclass bootstd: Add the bootmeth uclass and helpers bootstd: Add support for bootflows bootstd: Add a bootdev command bootstd: Add a bootflow ommand bootstd: Add a bootmeth command bootstd: Add an implementation of distro boot bootstd: mmc: Add a bootdev driver bootstd: ethernet: Add a bootdev driver bootstd: Add an implementation of distro PXE boot bootstd: Add an implementation of EFI boot bootstd: Add a system bootdev for strange boot methods bootstd: Add an implementation of EFI bootmgr bootstd: Add a sandbox bootmeth driver bootstd: usb: Add a bootdev driver test: fastboot: Avoid using mmc1 test: dm: Restart USB before assuming it is stopped bootstd: Add tests for bootstd including all uclasses bootstd: Add setup for the bootflow tests bootstd: doc: Add documentation RFC: Switch rpi over to use bootstd MAINTAINERS | 21 + Makefile | 18 +- arch/arm/config.mk | 4 +- arch/arm/include/asm/global_data.h | 2 +- arch/sandbox/cpu/os.c | 10 + arch/sandbox/dts/test.dts | 19 + boot/Kconfig | 77 ++- boot/Makefile | 14 + boot/bootdev-uclass.c | 439 ++++++++++++++ boot/bootflow.c | 576 ++++++++++++++++++ boot/bootmeth-uclass.c | 59 ++ boot/bootmeth_distro.c | 217 +++++++ boot/bootmeth_efi.c | 263 ++++++++ boot/bootmeth_efi_mgr.c | 84 +++ boot/bootmeth_pxe.c | 183 ++++++ boot/bootmeth_sandbox.c | 67 +++ boot/bootstd-uclass.c | 176 ++++++ boot/system_bootdev.c | 64 ++ cmd/Kconfig | 15 + cmd/Makefile | 1 + cmd/bootdev.c | 120 ++++ cmd/bootflow.c | 386 ++++++++++++ cmd/bootmeth.c | 158 +++++ cmd/mbr.c | 8 +- common/Kconfig | 10 + common/console.c | 4 +- common/usb_storage.c | 12 + configs/amcore_defconfig | 1 + configs/rcar3_salvator-x_defconfig | 1 + configs/sandbox_defconfig | 3 +- configs/sandbox_flattree_defconfig | 4 +- configs/tbs2910_defconfig | 1 + disk/part_dos.c | 10 +- doc/build/gcc.rst | 17 + doc/develop/bootstd.rst | 600 +++++++++++++++++++ doc/develop/distro.rst | 3 + doc/develop/index.rst | 1 + doc/device-tree-bindings/bootdev.txt | 26 + doc/device-tree-bindings/bootmeth.txt | 31 + doc/device-tree-bindings/bootstd.txt | 36 ++ doc/device-tree-bindings/mmc/sandbox,mmc.txt | 18 + doc/usage/bootdev.rst | 135 +++++ doc/usage/bootflow.rst | 427 +++++++++++++ doc/usage/bootmeth.rst | 106 ++++ doc/usage/index.rst | 3 + drivers/core/device-remove.c | 9 +- drivers/core/device.c | 13 +- drivers/core/of_access.c | 3 +- drivers/core/ofnode.c | 26 + drivers/core/read.c | 6 + drivers/core/uclass.c | 29 +- drivers/mmc/Makefile | 5 + drivers/mmc/mmc-uclass.c | 27 +- drivers/mmc/mmc_bootdev.c | 62 ++ drivers/mmc/sandbox_mmc.c | 60 +- drivers/usb/host/Makefile | 4 + drivers/usb/host/usb_bootdev.c | 61 ++ include/bootdev.h | 258 ++++++++ include/bootflow.h | 304 ++++++++++ include/bootmeth.h | 156 +++++ include/bootstd.h | 80 +++ include/configs/rpi.h | 41 +- include/distro.h | 24 + include/dm/device.h | 12 + include/dm/ofnode.h | 24 +- include/dm/read.h | 28 + include/dm/uclass-id.h | 3 + include/dm/uclass-internal.h | 14 +- include/dm/uclass.h | 17 + include/mmc.h | 12 +- include/os.h | 9 + include/test/suites.h | 2 + include/vsprintf.h | 18 + lib/strto.c | 14 +- net/Kconfig | 9 + net/Makefile | 1 + net/eth-uclass.c | 8 + net/eth_bootdev.c | 101 ++++ test/Makefile | 1 + test/boot/Makefile | 5 + test/boot/bootdev.c | 200 +++++++ test/boot/bootflow.c | 398 ++++++++++++ test/boot/bootmeth.c | 90 +++ test/boot/bootstd_common.c | 35 ++ test/boot/bootstd_common.h | 27 + test/cmd_ut.c | 7 + test/dm/blk.c | 6 + test/dm/fastboot.c | 4 +- test/dm/ofnode.c | 96 +++ test/py/conftest.py | 2 +- test/py/multiplexed_log.py | 10 +- test/py/tests/bootstd/mmc1.img.xz | Bin 0 -> 4448 bytes test/py/tests/test_ut.py | 103 ++++ test/py/u_boot_utils.py | 5 +- 94 files changed, 6765 insertions(+), 94 deletions(-) create mode 100644 boot/bootdev-uclass.c create mode 100644 boot/bootflow.c create mode 100644 boot/bootmeth-uclass.c create mode 100644 boot/bootmeth_distro.c create mode 100644 boot/bootmeth_efi.c create mode 100644 boot/bootmeth_efi_mgr.c create mode 100644 boot/bootmeth_pxe.c create mode 100644 boot/bootmeth_sandbox.c create mode 100644 boot/bootstd-uclass.c create mode 100644 boot/system_bootdev.c create mode 100644 cmd/bootdev.c create mode 100644 cmd/bootflow.c create mode 100644 cmd/bootmeth.c create mode 100644 doc/develop/bootstd.rst create mode 100644 doc/device-tree-bindings/bootdev.txt create mode 100644 doc/device-tree-bindings/bootmeth.txt create mode 100644 doc/device-tree-bindings/bootstd.txt create mode 100644 doc/device-tree-bindings/mmc/sandbox,mmc.txt create mode 100644 doc/usage/bootdev.rst create mode 100644 doc/usage/bootflow.rst create mode 100644 doc/usage/bootmeth.rst create mode 100644 drivers/mmc/mmc_bootdev.c create mode 100644 drivers/usb/host/usb_bootdev.c create mode 100644 include/bootdev.h create mode 100644 include/bootflow.h create mode 100644 include/bootmeth.h create mode 100644 include/bootstd.h create mode 100644 include/distro.h create mode 100644 net/eth_bootdev.c create mode 100644 test/boot/Makefile create mode 100644 test/boot/bootdev.c create mode 100644 test/boot/bootflow.c create mode 100644 test/boot/bootmeth.c create mode 100644 test/boot/bootstd_common.c create mode 100644 test/boot/bootstd_common.h create mode 100644 test/py/tests/bootstd/mmc1.img.xz -- 2.33.0.1079.g6e70778dc9-goog

9 114

[PATCH v3 0/3] Add SPL build support for RK3568
by Nico Cheng 11 Mar '22

11 Mar '22

This series adds support for the rk3568 SOC, SPL load next-stage image from eMMC will be supported after this series of patches. Changes in v3: Replace configuration parameters of SGRF_SOC_CON4 with macro definitions. Changes in v2: We use the rk_clrreg function instead of the writel to set eMMC sdmmc0 to secure. Modify comments to make them more explicit. Nico Cheng (3): rockchip: Kconfig: Enable SPL support for rk3568 arm: dts: rockchip: rk3568: Enable sdhci and sdmmc0 node rockchip: rk3568: add arch_cpu_init() arch/arm/dts/rk3568-u-boot.dtsi | 17 ++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 2 ++ arch/arm/mach-rockchip/rk3568/rk3568.c | 27 +++++++++++++++++++++++--- configs/evb-rk3568_defconfig | 25 +++++++++++++++++++++++- include/configs/rk3568_common.h | 4 ++++ 5 files changed, 71 insertions(+), 4 deletions(-) -- 2.17.1

5 10

[RFC PATCH v1 0/6] add rk3318 A95X Z2 board
by Johan Jonker 11 Mar '22

11 Mar '22

With a new board from a recent Linux DT the U-boot rk3328.dtsi is in need for an update. Please advise what to do with usb3 regulators, aliases and other stuff that has to change. Also some of the U-boot board files could use some dtbs_check for bogus properties and restyling... ;) rk3328 USB2 and USB3 only roughly tested. === Howto use: Compile bl31.elf: git clone --depth 1 https://github.com/ARM-software/arm-trusted-firmware.git cd arm-trusted-firmware make realclean make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3328 export BL31=/<path-to>/arm-trusted-firmware/build/rk3328/release/bl31/bl31.elf cd .. Compile U-boot: git clone --depth 1 https://github.com/u-boot/u-boot.git uboot cd uboot make CROSS_COMPILE=aarch64-linux-gnu- a95x-z2-rk3318_defconfig all === Use U-boot to create a GPT on a SD card, because of partition GUID and sizes. mmc dev 0 mmc info gpt write mmc 0 $partitions mmc part === Write to SD card: export DISK=/dev/mmcblk0 sudo dd if=./idbloader.img of=${DISK} seek=64 sudo dd if=./u-boot.itb of=${DISK} seek=16384 sync === Format boot partition with fat16. Add /Image and /rk3318-a95x-z2.dtb Add extlinux dir with extlinux.conf label kernel kernel /Image fdt /rk3318-a95x-z2.dtb append root=/dev/mmcblk0p5 rw console=tty0 console=ttyS2,1500000n8 earlycon=uart8250,mmio32,0xff130000,keep $ === Use fastboot: Hit any key to stop autoboot: usb start usb dev 1 fastboot usb 1 = sudo fastboot devices -l sudo fastboot erase loader1 sudo fastboot erase loader2 sudo fastboot flash loader1 idbloader.img sudo fastboot flash loader2 u-boot.itb = ctrl-c reset === Johan Jonker (6): arm: dts: rockchip: update rk3328.dtsi arm: dts: rockchip: remove usb_host0_xhci node from rk3328-u-boot.dtsi arm: dts: rockchip: move mmc aliases to board files arm: dts: rockchip: move spi0 u-boot,dm-pre-reloc and alias to rk3328 board files rockchip: rk3318: add a95x-z2-rk3318_defconfig file arm: dts: rockchip: add rk3318 A95X Z2 board arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3318-a95x-z2-u-boot.dtsi | 59 +++++ arch/arm/dts/rk3318-a95x-z2.dts | 384 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-evb.dts | 8 +- arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-nanopi-r2s.dts | 6 +- arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 4 +- arch/arm/dts/rk3328-roc-cc.dts | 7 +- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 4 +- arch/arm/dts/rk3328-rock-pi-e.dts | 7 +- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 10 +- arch/arm/dts/rk3328-rock64.dts | 7 +- arch/arm/dts/rk3328-u-boot.dtsi | 21 -- arch/arm/dts/rk3328.dtsi | 109 ++++---- board/rockchip/evb_rk3328/MAINTAINERS | 6 + configs/a95x-z2-rk3318_defconfig | 102 ++++++++ doc/board/rockchip/rockchip.rst | 2 + 18 files changed, 661 insertions(+), 80 deletions(-) create mode 100644 arch/arm/dts/rk3318-a95x-z2-u-boot.dtsi create mode 100644 arch/arm/dts/rk3318-a95x-z2.dts create mode 100644 configs/a95x-z2-rk3318_defconfig -- 2.11.0

4 12

[PATCH v1 0/9] Add Nuvoton NPCM845 support
by Stanley Chu 11 Mar '22

11 Mar '22

The patch series add basic supoorts for NPCM845, which is Nuvoton's 4th-generation BMC (Baseboard Management Controller). Add drivers to support Clock,Timer,Uart,GPIO, Pinctrl, SPI Flash Access for NPCM8xx SoC. Stanley Chu (9): arm: nuvoton: Add support for Nuvoton NPCM845 BMC clk: nuvoton: Add support for NPCM845 timer: npcm: Add NPCM timer support serial: npcm: Add support for Nuvoton NPCM SoCs gpio: npcm: Add support for Nuvoton NPCM SoCs pinctrl: nuvoton: Add NPCM8xx pinctrl driver spi: npcm-fiu: add NPCM8xx FIU controller driver ARM: dts: Add Nuvoton NPCM845 device tree ARM: configs: Add defconfig for Nuvoton NPCM845 arch/arm/Kconfig | 9 + arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/nuvoton-common-npcm8xx.dtsi | 598 ++++++ arch/arm/dts/nuvoton-npcm845-evb.dts | 264 +++ arch/arm/dts/nuvoton-npcm845-pincfg.dtsi | 2007 ++++++++++++++++++++ arch/arm/dts/nuvoton-npcm8xx-pinctrl.dtsi | 623 +++++++ arch/arm/include/asm/arch-npcm8xx/clock.h | 164 ++ arch/arm/include/asm/arch-npcm8xx/espi.h | 23 + arch/arm/include/asm/arch-npcm8xx/fiu.h | 61 + arch/arm/include/asm/arch-npcm8xx/gcr.h | 313 ++++ arch/arm/include/asm/arch-npcm8xx/gpio.h | 11 + arch/arm/include/asm/arch-npcm8xx/rst.h | 32 + arch/arm/include/asm/arch-npcm8xx/uart.h | 82 + arch/arm/mach-nuvoton/Kconfig | 24 + arch/arm/mach-nuvoton/Makefile | 1 + arch/arm/mach-nuvoton/npcm8xx/Kconfig | 18 + arch/arm/mach-nuvoton/npcm8xx/Makefile | 1 + arch/arm/mach-nuvoton/npcm8xx/cpu.c | 170 ++ arch/arm/mach-nuvoton/npcm8xx/reset.c | 51 + board/nuvoton/arbel/Kconfig | 18 + board/nuvoton/arbel/MAINTAINERS | 7 + board/nuvoton/arbel/Makefile | 1 + board/nuvoton/arbel/arbel.c | 33 + configs/arbel_evb_defconfig | 77 + drivers/clk/Makefile | 1 + drivers/clk/nuvoton/Makefile | 1 + drivers/clk/nuvoton/clk_npcm8xx.c | 213 +++ drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/npcm_gpio.c | 133 ++ drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/nuvoton/Kconfig | 6 + drivers/pinctrl/nuvoton/Makefile | 1 + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2042 +++++++++++++++++++++ drivers/serial/Kconfig | 7 + drivers/serial/Makefile | 1 + drivers/serial/serial_npcm.c | 137 ++ drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/npcm_fiu_spi.c | 311 ++++ drivers/timer/Kconfig | 7 + drivers/timer/Makefile | 1 + drivers/timer/npcm_timer.c | 82 + include/configs/arbel.h | 54 + include/dt-bindings/clock/npcm845-clock.h | 17 + 47 files changed, 7622 insertions(+) create mode 100644 arch/arm/dts/nuvoton-common-npcm8xx.dtsi create mode 100644 arch/arm/dts/nuvoton-npcm845-evb.dts create mode 100644 arch/arm/dts/nuvoton-npcm845-pincfg.dtsi create mode 100644 arch/arm/dts/nuvoton-npcm8xx-pinctrl.dtsi create mode 100644 arch/arm/include/asm/arch-npcm8xx/clock.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/espi.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/fiu.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/gcr.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/gpio.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/rst.h create mode 100644 arch/arm/include/asm/arch-npcm8xx/uart.h create mode 100644 arch/arm/mach-nuvoton/Kconfig create mode 100644 arch/arm/mach-nuvoton/Makefile create mode 100644 arch/arm/mach-nuvoton/npcm8xx/Kconfig create mode 100644 arch/arm/mach-nuvoton/npcm8xx/Makefile create mode 100644 arch/arm/mach-nuvoton/npcm8xx/cpu.c create mode 100644 arch/arm/mach-nuvoton/npcm8xx/reset.c create mode 100644 board/nuvoton/arbel/Kconfig create mode 100644 board/nuvoton/arbel/MAINTAINERS create mode 100644 board/nuvoton/arbel/Makefile create mode 100644 board/nuvoton/arbel/arbel.c create mode 100644 configs/arbel_evb_defconfig create mode 100644 drivers/clk/nuvoton/Makefile create mode 100644 drivers/clk/nuvoton/clk_npcm8xx.c create mode 100644 drivers/gpio/npcm_gpio.c create mode 100644 drivers/pinctrl/nuvoton/Kconfig create mode 100644 drivers/pinctrl/nuvoton/Makefile create mode 100644 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c create mode 100644 drivers/serial/serial_npcm.c create mode 100644 drivers/spi/npcm_fiu_spi.c create mode 100644 drivers/timer/npcm_timer.c create mode 100644 include/configs/arbel.h create mode 100644 include/dt-bindings/clock/npcm845-clock.h -- 2.17.1

7 28