January 2022 - U-Boot

[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 v1 1/2] rockchip: mmc: rockchip_dw_mmc: fix ciu clock index
by Johan Jonker 12 Mar '22

12 Mar '22

The document rockchip-dw-mshc.yaml decribes a maximum of 4 clocks. In the rockchip_dw_mmc driver the clock name in use was "fixed" to "ciu" with index 1, but later reverted back to index 0. The clock drivers can handle both, but the calling driver should submit correct data as a standard practice. Fix the "ciu" clock index by setting it back to 1. clock-names: minItems: 2 items: - const: biu - const: ciu - const: ciu-drive - const: ciu-sample Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> --- drivers/mmc/rockchip_dw_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 7f8dea1e..be065ec0 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -123,11 +123,11 @@ static int rockchip_dwmmc_probe(struct udevice *dev) priv->minmax[0] = 400000; /* 400 kHz */ priv->minmax[1] = dtplat->max_frequency; - ret = clk_get_by_phandle(dev, dtplat->clocks, &priv->clk); + ret = clk_get_by_phandle(dev, &dtplat->clocks[1], &priv->clk); if (ret < 0) return ret; #else - ret = clk_get_by_index(dev, 0, &priv->clk); + ret = clk_get_by_index(dev, 1, &priv->clk); if (ret < 0) return ret; #endif -- 2.20.1

2 3

[PATCH v1 1/3] rockchip: serial: restyle the serial_rockchip.c driver
by Johan Jonker 12 Mar '22

12 Mar '22

The ns16550.c driver has the following conditions for .of_match: CONFIG_IS_ENABLED(OF_REAL) For Rockchip SoCs with TPL/SPL and platform data that need serial support the serial_rockchip.c driver was made. It copies this data and then calls ns16550_serial_probe(). With the addition of yet an other SoC type this driver is in need for a little restyle. Simplify struct rockchip_uart_plat and add extra SoCs with DM_DRIVER_ALIAS(). Return -ENODEV when the ns16550.c driver probe function is available. Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> --- drivers/serial/serial_rockchip.c | 36 +++++++++++++------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index 97d40869..0d1d9fff 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -12,22 +12,19 @@ #include <asm/arch-rockchip/clock.h> #include <dm/device-internal.h> -#if defined(CONFIG_ROCKCHIP_RK3188) -struct rockchip_uart_plat { - struct dtd_rockchip_rk3188_uart dtplat; - struct ns16550_plat plat; -}; -struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat; -#elif defined(CONFIG_ROCKCHIP_RK3288) struct rockchip_uart_plat { +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_uart dtplat; +#endif struct ns16550_plat plat; }; +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat; #endif static int rockchip_serial_probe(struct udevice *dev) { +#if CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_uart_plat *plat = dev_get_plat(dev); /* Create some new platform data for the standard driver */ @@ -38,24 +35,19 @@ static int rockchip_serial_probe(struct udevice *dev) dev_set_plat(dev, &plat->plat); return ns16550_serial_probe(dev); +#else + return -ENODEV; +#endif } -U_BOOT_DRIVER(rockchip_rk3188_uart) = { - .name = "rockchip_rk3188_uart", - .id = UCLASS_SERIAL, - .priv_auto = sizeof(struct ns16550), - .plat_auto = sizeof(struct rockchip_uart_plat), - .probe = rockchip_serial_probe, - .ops = &ns16550_serial_ops, - .flags = DM_FLAG_PRE_RELOC, -}; - U_BOOT_DRIVER(rockchip_rk3288_uart) = { - .name = "rockchip_rk3288_uart", - .id = UCLASS_SERIAL, + .name = "rockchip_rk3288_uart", + .id = UCLASS_SERIAL, .priv_auto = sizeof(struct ns16550), .plat_auto = sizeof(struct rockchip_uart_plat), - .probe = rockchip_serial_probe, - .ops = &ns16550_serial_ops, - .flags = DM_FLAG_PRE_RELOC, + .probe = rockchip_serial_probe, + .ops = &ns16550_serial_ops, + .flags = DM_FLAG_PRE_RELOC, }; +DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3066_uart) +DM_DRIVER_ALIAS(rockchip_rk3288_uart, rockchip_rk3188_uart) -- 2.20.1

3 6

[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] dm: core: Check flags before removing devices
by Marek Vasut 12 Mar '22

12 Mar '22

Calling device_chld_remove() before flags_remove() means all devices get removed no matter whether they should be removed late or not. This breaks teardown of eMMC when booting and other critical boot paths. Fixes: c51d2e704a1 ("dm: core: Avoid partially removing devices") Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/core/device-remove.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index e6ec6ff4212..0454f55c330 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -207,14 +207,6 @@ int device_remove(struct udevice *dev, uint flags) if (!(dev_get_flags(dev) & DM_FLAG_ACTIVATED)) return 0; - /* - * If the child returns EKEYREJECTED, continue. It just means that it - * didn't match the flags. - */ - ret = device_chld_remove(dev, NULL, flags); - if (ret && ret != -EKEYREJECTED) - return ret; - /* * Remove the device if called with the "normal" remove flag set, * or if the remove flag matches any of the drivers remove flags @@ -228,6 +220,14 @@ int device_remove(struct udevice *dev, uint flags) return ret; } + /* + * If the child returns EKEYREJECTED, continue. It just means that it + * didn't match the flags. + */ + ret = device_chld_remove(dev, NULL, flags); + if (ret && ret != -EKEYREJECTED) + return ret; + ret = uclass_pre_remove_device(dev); if (ret) return ret; -- 2.34.1

2 3

[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