October 2023 - U-Boot

[PATCH v2 00/27] Tidy up use of CONFIG_CMDLINE
by Simon Glass 10 Oct '23

10 Oct '23

It should be possible to disable CONFIG_CMDLINE and have all commands and related functionality dropped from U-Boot. This is useful when trying to reduce the size of U-Boot. Recent changes have stopped this from working. This series repairs the feature for sandbox and adds a test to stop it breaking again. Note that quite a lot of functionality is lost if CONFIG_CMDLINE is disabled, e.g. networking and most booting options. Further work is needed to make the option more generally useful. Changes in v2: - Move AUTOBOOT_USE_MENUKEY under AUTOBOOT - Change this to use a Kconfig dependency instead of code failing - Add new patch to drop discarding of command linker-lists - Add new patch to unify the U_BOOT_ENV_LOCATION conditions - Rebase on Tom's LONGHELP series - Correct 'of' typo Simon Glass (25): buildman: Use oldconfig when adjusting the config bootstd: Correct dependencies on CMDLINE autoboot: Correct dependencies on CMDLINE cmd: Add a few more dependencies on CMDLINE test: Make UNIT_TEST depend on CMDLINE sifive: Change #ifdef for nop fastboot: Declare a dependency on CMDLINE cli: Always build cli_getch cmd: Use an #ifdef around run_commandf() Move bootmenu_conv_key() into its own file pxe: Depend on CMDLINE env: Split out non-command code into a new file console: Move SYS_PBSIZE into common/ bootm: Allow building when cleanup functions are missing fdt: Move working_fdt into fdt_support net: Depend on CONFIG_CMDLINE log: Allow use without CONFIG_CMDLINE video: Allow use without CONFIG_CMDLINE video: Dont require the font command efi: Depend on CMDLINE for efi_loader cmd: Make all commands depend on CMDLINE sandbox: Avoid requiring cmdline arm: x86: Drop discarding of command linker-lists mmc: env: Unify the U_BOOT_ENV_LOCATION conditions sandbox: Add a test for disabling CONFIG_CMDLINE Tom Rini (2): command.h: Add a U_BOOT_LONGHELP macro cmd: Convert existing long help messages to the new macro arch/Kconfig | 6 +- arch/arm/cpu/u-boot.lds | 3 - arch/arm/lib/bootm.c | 2 + arch/arm/mach-imx/cmd_nandbcb.c | 6 +- arch/x86/cpu/u-boot-64.lds | 4 - arch/x86/cpu/u-boot-spl.lds | 4 - arch/x86/cpu/u-boot.lds | 4 - board/freescale/common/ngpixis.c | 6 +- .../work_92105/work_92105_display.c | 12 +- board/xilinx/common/fru.c | 7 +- board/xilinx/versal/cmds.c | 7 +- board/xilinx/zynq/cmds.c | 6 +- board/xilinx/zynqmp/cmds.c | 6 +- boot/Kconfig | 48 ++++--- boot/bootm.c | 10 +- boot/fdt_support.c | 5 + cmd/Kconfig | 25 ++-- cmd/Makefile | 2 +- cmd/acpi.c | 6 +- cmd/aes.c | 6 +- cmd/armffa.c | 4 +- cmd/axi.c | 4 +- cmd/bloblist.c | 6 +- cmd/bootcount.c | 9 +- cmd/bootdev.c | 6 +- cmd/bootefi.c | 6 +- cmd/bootflow.c | 9 +- cmd/booti.c | 6 +- cmd/bootm.c | 6 +- cmd/bootmeth.c | 6 +- cmd/bootz.c | 6 +- cmd/cat.c | 6 +- cmd/cedit.c | 6 +- cmd/clk.c | 6 +- cmd/conitrace.c | 4 +- cmd/cpu.c | 7 +- cmd/cyclic.c | 4 +- cmd/dm.c | 7 +- cmd/efidebug.c | 6 +- cmd/event.c | 6 +- cmd/fdt.c | 11 +- cmd/font.c | 6 +- cmd/help.c | 5 +- cmd/i2c.c | 6 +- cmd/kaslrseed.c | 6 +- cmd/log.c | 7 +- cmd/mp.c | 6 +- cmd/mtd.c | 6 +- cmd/mtdparts.c | 6 +- cmd/mux.c | 4 +- cmd/nand.c | 6 +- cmd/nvedit.c | 128 +---------------- cmd/osd.c | 4 +- cmd/pcap.c | 4 +- cmd/pci.c | 6 +- cmd/pci_mps.c | 6 +- cmd/riscv/sbi.c | 7 +- cmd/rng.c | 6 +- cmd/sandbox/exception.c | 5 +- cmd/scp03.c | 7 +- cmd/sf.c | 8 +- cmd/source.c | 9 +- cmd/ti/pd.c | 10 +- cmd/vbe.c | 6 +- cmd/wdt.c | 4 +- cmd/ximg.c | 6 +- cmd/xxd.c | 6 +- common/Kconfig | 5 + common/Makefile | 3 +- common/cli.c | 2 + common/cli_getch.c | 1 + common/log.c | 4 +- common/menu.c | 40 ------ common/menu_key.c | 49 +++++++ drivers/fastboot/Kconfig | 1 + drivers/video/Kconfig | 2 +- drivers/video/console_truetype.c | 4 + env/Makefile | 1 + env/env_set.c | 132 ++++++++++++++++++ env/mmc.c | 2 +- include/bootm.h | 15 +- include/command.h | 3 + include/env_internal.h | 23 +++ include/k210/pll.h | 2 +- lib/efi_loader/Kconfig | 2 + net/Kconfig | 1 + test/Kconfig | 1 + test/cmd_ut.c | 6 +- test/fuzz/cmd_fuzz.c | 7 +- test/py/tests/test_sandbox_opts.py | 20 +++ tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 + tools/buildman/func_test.py | 4 +- 93 files changed, 462 insertions(+), 462 deletions(-) create mode 100644 common/menu_key.c create mode 100644 env/env_set.c create mode 100644 test/py/tests/test_sandbox_opts.py -- 2.42.0.609.gbb76f46606-goog

3 35

[PATCH v3] rockchip: rk3568-radxa-e25: Enable pcie3x1 node
by Jonas Karlman 09 Oct '23

09 Oct '23

Enable mini PCIe slot, pcie3x1 node, now that the PCIe PHY driver support bifurcation. A pinctrl is assigned for reset-gpios or the device may freeze running pci enum and nothing is connected to the mini PCIe slot. Also drop the AHCI_PCI Kconfig option as this option is not required for a functional M.2 SATA drive slot. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> --- v3: - Collect r-b tag v2: - No change arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 11 +++++++++-- configs/radxa-e25-rk3568_defconfig | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi index 572bdc5665b1..1136f0bb3b81 100644 --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi @@ -8,9 +8,16 @@ }; }; -/* PCIe PHY driver in U-Boot does not support bifurcation */ &pcie3x1 { - status = "disabled"; + pinctrl-0 = <&pcie30x1_reset_h>; +}; + +&pinctrl { + pcie { + pcie30x1_reset_h: pcie30x1-reset-h { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &sdhci { diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig index a905100a794d..2dfff6af3bd1 100644 --- a/configs/radxa-e25-rk3568_defconfig +++ b/configs/radxa-e25-rk3568_defconfig @@ -54,7 +54,6 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y -CONFIG_AHCI_PCI=y CONFIG_DWC_AHCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y -- 2.42.0

1 0

[PATCH] RFC: x86: serial: ns16550: Allow the UART to be silently disabled
by Simon Glass 09 Oct '23

09 Oct '23

U-Boot normally requires a UART. When booting from coreboot it is sometimes just not available, e.g. when no sysinfo or DBG2 information is provided. In this case we need to continue running, since the display can be used. Add a flag to disable serial for this case. This allows U-Boot to start up and operation from the display, instead of hanging on start-up. This could perhaps be hidden behind a Kconfig option to reduce code size. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/serial/ns16550.c | 17 +++++++++++++++-- drivers/serial/serial_coreboot.c | 1 + include/ns16550.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index eab9537fbae..6bb84f8c5bc 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -384,6 +384,8 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch) { struct ns16550 *const com_port = dev_get_priv(dev); + if (com_port->plat->flags & NS16550_FLAG_DISABLE) + return 0; if (!(serial_in(&com_port->lsr) & UART_LSR_THRE)) return -EAGAIN; serial_out(ch, &com_port->thr); @@ -404,6 +406,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input) { struct ns16550 *const com_port = dev_get_priv(dev); + if (com_port->plat->flags & NS16550_FLAG_DISABLE) + return 0; + if (input) return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0; else @@ -414,6 +419,9 @@ static int ns16550_serial_getc(struct udevice *dev) { struct ns16550 *const com_port = dev_get_priv(dev); + if (com_port->plat->flags & NS16550_FLAG_DISABLE) + return 0; + if (!(serial_in(&com_port->lsr) & UART_LSR_DR)) return -EAGAIN; @@ -428,7 +436,8 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate); - ns16550_setbrg(com_port, clock_divisor); + if (!(plat->flags & NS16550_FLAG_DISABLE)) + ns16550_setbrg(com_port, clock_divisor); return 0; } @@ -441,6 +450,9 @@ static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config) uint bits = SERIAL_GET_BITS(serial_config); uint stop = SERIAL_GET_STOP(serial_config); + if (com_port->plat->flags & NS16550_FLAG_DISABLE) + return 0; + /* * only parity config is implemented, check if other serial settings * are the default one. @@ -525,7 +537,8 @@ int ns16550_serial_probe(struct udevice *dev) reset_deassert_bulk(&reset_bulk); com_port->plat = dev_get_plat(dev); - ns16550_init(com_port, -1); + if (!(plat->flags & NS16550_FLAG_DISABLE)) + ns16550_init(com_port, -1); return 0; } diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index 23066e4d054..cdf9afc1739 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -120,6 +120,7 @@ static int coreboot_of_to_plat(struct udevice *dev) * there is no UART, which may panic. So stay silent and * pray that the video console will work. */ + plat->flags |= NS16550_FLAG_DISABLE; log_debug("Cannot detect UART\n"); } diff --git a/include/ns16550.h b/include/ns16550.h index e7e68663d03..618bb4026b3 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -52,6 +52,7 @@ enum ns16550_flags { NS16550_FLAG_IO = 1 << 0, /* Use I/O access (else mem-mapped) */ NS16550_FLAG_ENDIAN = 1 << 1, /* Use out_le/be_32() */ NS16550_FLAG_BE = 1 << 2, /* Big-endian access (else little) */ + NS16550_FLAG_DISABLE = BIT(3), /* No output or input */ }; /** -- 2.42.0.609.gbb76f46606-goog

1 0

[PATCH v2 1/3] dt-bindings: mtd: fixed-partitions: Add binman compatible
by Simon Glass 09 Oct '23

09 Oct '23

Add a compatible string for binman, so we can extend fixed-partitions in various ways. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Drop mention of 'enhanced features' in fixed-partitions.yaml - Mention Binman input and output properties - Use plain partition@xxx for the node name .../bindings/mtd/partitions/binman.yaml | 61 +++++++++++++++++++ .../mtd/partitions/fixed-partitions.yaml | 3 + .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 4 files changed, 70 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..844f241feebf --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman firmware layout + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +select: false + +description: | + The binman node provides a layout for firmware, used when packaging firmware + from multiple projects. It is based on fixed-partitions, with some + extensions. + + Binman supports properties used as inputs to the firmware-packaging process, + such as those which control alignment of partitions. This binding addresses + these 'input' properties. For example, it is common for the 'reg' property + (an 'output' property) to be set by Binman, based on the alignment requested + in the input. + + Once processing is complete, input properties have mostly served their + purpose, at least until the firmware is repacked later, e.g. due to a + firmware update. The base 'fixed-partitions' binding should provide enough + information to read the firmware at runtime, including decompression if + needed. + + Documentation for Binman is available at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html + + with the current image-description format at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-d… + +allOf: + - $ref: /schemas/mtd/partitions/fixed-partitions.yaml# + +properties: + compatible: + const: binman + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman", "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml index 331e564f29dc..85aef1572967 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml @@ -24,6 +24,9 @@ properties: - items: - const: sercomm,sc-partitions - const: fixed-partitions + - items: + - const: binman + - const: fixed-partitions "#address-cells": true diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index 1dda2c80747b..849fd15d085c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -15,6 +15,7 @@ maintainers: oneOf: - $ref: arm,arm-firmware-suite.yaml + - $ref: binman.yaml - $ref: brcm,bcm4908-partitions.yaml - $ref: brcm,bcm947xx-cfe-partitions.yaml - $ref: fixed-partitions.yaml diff --git a/MAINTAINERS b/MAINTAINERS index 5f18c6ba3c3c..367c843ec348 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3517,6 +3517,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass <sjg(a)chromium.org> +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov <yury.norov(a)gmail.com> R: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -- 2.42.0.582.g8ccd20d70d-goog

4 15

[PATCH v3 00/38] spl: Preparation for Universal Payload
by Simon Glass 09 Oct '23

09 Oct '23

This series tidies up SPL a little and adds some core ofnode functions needed to support Universal Payload. It also includes a few minor fix-ups for sandbox. For SPL the changes include CONFIG naming, removing various #ifdefs and tidying up the FIT code. One notable piece of the ofnode improvements is support for flattening a livetree. This should be useful in future as we move FDT fixups to use the ofnode API. Changes in v3: - Mention testing on qemu-ppce500 - Add new patch to create a proper symbol for enabling the malloc() pool - Add new patch to enable CONFIG_SPL_SYS_MALLOC_F where needed - Add new patch to nable CONFIG_TPL_SYS_MALLOC_F where needed - Add new patch to use SYS_MALLOC_F instead of SYS_MALLOC_F_LEN - Add new patch to tidy up uses of CONFIG_SYS_MALLOC_F_LEN - Add new patch to clean up SYS_MALLOC_SIMPLE documentation - Add new patch to correct help in TPL_DM and VPL_DM - Rebase on the new patch Changes in v2: - Rename based on Tom's feedback - Improve readability by moving the size part to the header file - Explicitly copy two maintainers as it seems only Mario was auto-cc'd - Change the approach to use the header file - Use the same condition for both pieces to avoid possible problems - No changes as it still seems unclear what should be done Simon Glass (38): spl: Use CONFIG_SPL... instead of CONFIG_..._SPL_... spl: Rename SYS_SPL_ARGS_ADDR to SPL_PAYLOAD_ARGS_ADDR spl: Avoid #ifdef with CONFIG_SPL_SYS_MALLOC spl: mx6: powerpc: Drop the condition on timer_init() spl: Drop #ifdefs for BOARD_INIT and watchdog spl: Avoid #ifdef with CONFIG_SPL_PAYLOAD_ARGS_ADDR spl: Drop the switch() statement for OS selection spl: Create proper symbols for enabling the malloc() pool spl: Enable CONFIG_SPL_SYS_MALLOC_F where needed tpl: Enable CONFIG_TPL_SYS_MALLOC_F where needed spl: Use SYS_MALLOC_F instead of SYS_MALLOC_F_LEN Tidy up uses of CONFIG_SYS_MALLOC_F_LEN doc: Clean up SYS_MALLOC_SIMPLE dm: core: Correct help in TPL_DM and VPL_DM spl: Avoid an #ifdef when printing gd->malloc_ptr spl: Remove #ifdefs with BOOTSTAGE spl: Rename spl_load_fit_image() to load_simple_fit() spl: Move the full FIT code to spl_fit.c spl: Use the correct FIT_..._PROP constants spl: Move bloblist writing until the image is known dm: core: Reverse the argument order in ofnode_copy_props() dm: core: Ensure we run flattree tests on ofnode dm: core: Tidy up comments in the ofnode tests dm: core: Add a function to create an empty tree dm: core: Add a way to copy a node dm: core: Add a way to delete a node dm: core: Add a way to convert a devicetree to a dtb dm: core: Support writing a boolean dm: core: Support writing a 64-bit value dm: core: Add tests for oftree_path() sandbox: Move reading the RAM buffer into a better place sandbox: Init the EC properly even if no state file is available sandbox: Only read the state if we have a state file sandbox: Move the bloblist down a little in memory bloblist: Support initing from multiple places fdt: Allow the devicetree to come from a bloblist command: Include a required header in command.h pci: serial: Support reading PCI-register size with base Kconfig | 69 +++-- Makefile | 2 +- README | 18 -- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- .../armv8/fsl-layerscape/doc/README.falcon | 2 +- arch/arm/lib/bdinfo.c | 2 +- arch/arm/mach-rockchip/rv1126/Kconfig | 3 + arch/arm/mach-snapdragon/Kconfig | 3 + arch/arm/mach-socfpga/Kconfig | 3 + arch/mips/cpu/start.S | 4 +- arch/mips/mach-mtmips/mt7621/spl/start.S | 4 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 4 +- arch/sandbox/cpu/start.c | 29 +- arch/sandbox/cpu/state.c | 2 + arch/sandbox/dts/test.dts | 6 +- arch/sh/lib/start.S | 4 +- boot/vbe_request.c | 2 +- boot/vbe_simple_os.c | 2 +- common/Kconfig | 2 +- common/Makefile | 6 +- common/bloblist.c | 15 +- common/board_f.c | 6 +- common/board_r.c | 2 +- common/dlmalloc.c | 12 +- common/init/board_init.c | 4 +- common/spl/Kconfig | 16 +- common/spl/Kconfig.nxp | 2 +- common/spl/spl.c | 226 ++++----------- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 4 +- common/spl/spl_fit.c | 127 +++++++-- common/spl/spl_mmc.c | 2 +- common/spl/spl_nand.c | 10 +- common/spl/spl_nor.c | 8 +- common/spl/spl_spi.c | 2 +- common/spl/spl_ubi.c | 2 +- common/spl/spl_xip.c | 2 +- configs/am335x_baltos_defconfig | 4 +- configs/am335x_boneblack_vboot_defconfig | 4 +- configs/am335x_evm_defconfig | 4 +- configs/am335x_evm_spiboot_defconfig | 4 +- configs/am335x_guardian_defconfig | 4 +- configs/am335x_hs_evm_defconfig | 4 +- configs/am335x_hs_evm_uart_defconfig | 4 +- configs/am335x_igep003x_defconfig | 4 +- configs/am335x_pdu001_defconfig | 4 +- configs/am335x_shc_defconfig | 4 +- configs/am335x_shc_ict_defconfig | 4 +- configs/am335x_shc_netboot_defconfig | 4 +- configs/am335x_shc_sdboot_defconfig | 4 +- configs/am335x_sl50_defconfig | 4 +- configs/am3517_evm_defconfig | 6 +- configs/am43xx_evm_defconfig | 4 +- configs/am43xx_evm_rtconly_defconfig | 4 +- configs/am43xx_evm_usbhost_boot_defconfig | 4 +- configs/am43xx_hs_evm_defconfig | 4 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/am57xx_hs_evm_usb_defconfig | 4 +- configs/am62ax_evm_r5_defconfig | 6 +- configs/am62x_evm_r5_defconfig | 8 +- configs/am64x_evm_a53_defconfig | 4 +- configs/am64x_evm_r5_defconfig | 8 +- configs/am65x_evm_a53_defconfig | 4 +- configs/am65x_evm_r5_defconfig | 8 +- configs/am65x_evm_r5_usbdfu_defconfig | 8 +- configs/am65x_evm_r5_usbmsc_defconfig | 8 +- configs/am65x_hs_evm_a53_defconfig | 4 +- configs/am65x_hs_evm_r5_defconfig | 8 +- configs/apalis-tk1_defconfig | 8 +- configs/apalis_imx6_defconfig | 2 +- configs/apalis_t30_defconfig | 8 +- configs/axm_defconfig | 8 +- configs/beaver_defconfig | 8 +- configs/bitmain_antminer_s9_defconfig | 4 +- configs/brppt1_mmc_defconfig | 4 +- configs/brppt2_defconfig | 2 +- configs/brsmarc1_defconfig | 4 +- configs/brxre1_defconfig | 4 +- configs/cardhu_defconfig | 8 +- configs/cei-tk1-som_defconfig | 8 +- configs/cgtqmx8_defconfig | 8 +- configs/chiliboard_defconfig | 4 +- configs/cl-som-imx7_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/cm_t43_defconfig | 4 +- configs/colibri_imx6_defconfig | 2 +- configs/colibri_t20_defconfig | 8 +- configs/colibri_t30_defconfig | 8 +- configs/da850evm_defconfig | 8 +- configs/da850evm_nand_defconfig | 8 +- configs/dalmore_defconfig | 8 +- configs/deneb_defconfig | 8 +- configs/devkit8000_defconfig | 8 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 4 +- configs/display5_factory_defconfig | 4 +- configs/dra7xx_evm_defconfig | 4 +- configs/dra7xx_hs_evm_defconfig | 4 +- configs/dra7xx_hs_evm_usb_defconfig | 4 +- configs/draco_defconfig | 6 +- configs/endeavoru_defconfig | 8 +- configs/etamin_defconfig | 6 +- .../gardena-smart-gateway-at91sam_defconfig | 4 +- configs/ge_b1x5v2_defconfig | 2 +- configs/giedi_defconfig | 8 +- configs/grouper_common_defconfig | 8 +- configs/gwventana_emmc_defconfig | 4 +- configs/gwventana_nand_defconfig | 4 +- configs/harmony_defconfig | 8 +- configs/igep00x0_defconfig | 6 +- configs/imx28_xea_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 4 +- configs/imx6q_bosch_acc_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 4 +- configs/imx6qdl_icore_mipi_defconfig | 4 +- configs/imx6qdl_icore_mmc_defconfig | 4 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 4 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/imx6ulz_smm_m2_defconfig | 2 +- configs/imx7_cm_defconfig | 2 +- configs/imx8mm-cl-iot-gate-optee_defconfig | 8 +- configs/imx8mm-cl-iot-gate_defconfig | 8 +- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 8 +- configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 8 +- configs/imx8mm-mx8menlo_defconfig | 8 +- configs/imx8mm_beacon_defconfig | 8 +- configs/imx8mm_beacon_fspi_defconfig | 8 +- configs/imx8mm_data_modul_edm_sbc_defconfig | 8 +- configs/imx8mm_evk_defconfig | 8 +- configs/imx8mm_evk_fspi_defconfig | 8 +- configs/imx8mm_phg_defconfig | 8 +- configs/imx8mm_venice_defconfig | 6 +- configs/imx8mn_beacon_2g_defconfig | 8 +- configs/imx8mn_beacon_defconfig | 8 +- configs/imx8mn_beacon_fspi_defconfig | 8 +- configs/imx8mn_bsh_smm_s2_defconfig | 8 +- configs/imx8mn_bsh_smm_s2pro_defconfig | 8 +- configs/imx8mn_ddr4_evk_defconfig | 8 +- configs/imx8mn_evk_defconfig | 8 +- configs/imx8mn_var_som_defconfig | 8 +- configs/imx8mn_venice_defconfig | 8 +- configs/imx8mp-icore-mx8mp-edimm2.2_defconfig | 8 +- configs/imx8mp_beacon_defconfig | 8 +- configs/imx8mp_data_modul_edm_sbc_defconfig | 8 +- configs/imx8mp_dhcom_pdk2_defconfig | 8 +- configs/imx8mp_dhcom_pdk3_defconfig | 8 +- configs/imx8mp_evk_defconfig | 8 +- configs/imx8mp_rsb3720a1_4G_defconfig | 8 +- configs/imx8mp_rsb3720a1_6G_defconfig | 8 +- configs/imx8mp_venice_defconfig | 8 +- configs/imx8mq_cm_defconfig | 8 +- configs/imx8mq_evk_defconfig | 8 +- configs/imx8mq_phanbell_defconfig | 8 +- configs/imx8mq_reform2_defconfig | 8 +- configs/imx8qm_mek_defconfig | 8 +- configs/imx8qxp_mek_defconfig | 8 +- configs/imx8ulp_evk_defconfig | 8 +- configs/imx93_11x11_evk_defconfig | 8 +- configs/imx93_11x11_evk_ld_defconfig | 8 +- configs/iot2050_defconfig | 4 +- configs/j7200_evm_a72_defconfig | 4 +- configs/j7200_evm_r5_defconfig | 8 +- configs/j721e_evm_a72_defconfig | 4 +- configs/j721e_evm_r5_defconfig | 8 +- configs/j721s2_evm_a72_defconfig | 4 +- configs/j721s2_evm_r5_defconfig | 8 +- configs/jetson-tk1_defconfig | 8 +- configs/k2e_evm_defconfig | 4 +- configs/k2g_evm_defconfig | 4 +- configs/k2hk_evm_defconfig | 4 +- configs/k2l_evm_defconfig | 4 +- configs/kontron-sl-mx6ul_defconfig | 2 +- configs/kontron-sl-mx8mm_defconfig | 8 +- configs/kontron_pitx_imx8m_defconfig | 8 +- configs/kontron_sl28_defconfig | 2 +- configs/kp_imx6q_tpc_defconfig | 2 +- configs/librem5_defconfig | 8 +- configs/liteboard_defconfig | 2 +- configs/ls1021aiot_sdcard_defconfig | 6 +- configs/ls1021aqds_nand_defconfig | 6 +- configs/ls1021aqds_sdcard_ifc_defconfig | 6 +- configs/ls1021aqds_sdcard_qspi_defconfig | 6 +- configs/ls1021atsn_sdcard_defconfig | 6 +- ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 6 +- configs/ls1021atwr_sdcard_ifc_defconfig | 6 +- configs/ls1021atwr_sdcard_qspi_defconfig | 6 +- configs/ls1043aqds_nand_defconfig | 6 +- configs/ls1043aqds_sdcard_ifc_defconfig | 2 +- configs/ls1043aqds_sdcard_qspi_defconfig | 2 +- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 6 +- configs/ls1043ardb_nand_defconfig | 6 +- .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_sdcard_defconfig | 2 +- configs/ls1046aqds_nand_defconfig | 2 +- configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- configs/ls1046aqds_sdcard_qspi_defconfig | 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_spl_defconfig | 4 +- .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_sdcard_defconfig | 2 +- configs/ls1088aqds_sdcard_ifc_defconfig | 2 +- configs/ls1088aqds_sdcard_qspi_defconfig | 2 +- ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1088ardb_sdcard_qspi_defconfig | 2 +- configs/ls2080aqds_nand_defconfig | 2 +- configs/ls2080aqds_sdcard_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- configs/mccmon6_nor_defconfig | 4 +- configs/mccmon6_sd_defconfig | 2 +- configs/medcom-wide_defconfig | 8 +- configs/msc_sm2s_imx8mp_defconfig | 8 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6memcal_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/myir_mys_6ulx_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/nyan-big_defconfig | 8 +- configs/omap35_logic_defconfig | 6 +- configs/omap35_logic_somlv_defconfig | 6 +- configs/omap3_beagle_defconfig | 4 +- configs/omap3_evm_defconfig | 4 +- configs/omap3_logic_defconfig | 6 +- configs/omap3_logic_somlv_defconfig | 6 +- configs/omap4_panda_defconfig | 4 +- configs/omap4_sdp4430_defconfig | 4 +- configs/omapl138_lcdk_defconfig | 8 +- configs/openpiton_riscv64_spl_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/paz00_defconfig | 8 +- configs/pcm058_defconfig | 2 +- configs/phycore-am335x-r2-regor_defconfig | 4 +- configs/phycore-am335x-r2-wega_defconfig | 4 +- configs/phycore-imx8mm_defconfig | 8 +- configs/phycore-imx8mp_defconfig | 8 +- configs/phycore_pcl063_defconfig | 2 +- configs/phycore_pcl063_ull_defconfig | 2 +- configs/pico-dwarf-imx6ul_defconfig | 2 +- configs/pico-dwarf-imx7d_defconfig | 2 +- configs/pico-hobbit-imx6ul_defconfig | 2 +- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/pico-imx7d_bl33_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-imx8mq_defconfig | 8 +- configs/pico-nymph-imx7d_defconfig | 2 +- configs/pico-pi-imx6ul_defconfig | 2 +- configs/pico-pi-imx7d_defconfig | 2 +- configs/plutux_defconfig | 8 +- configs/pxm2_defconfig | 6 +- configs/qemu-riscv32_spl_defconfig | 2 +- configs/qemu-riscv64_spl_defconfig | 2 +- configs/rastaban_defconfig | 6 +- configs/ringneck-px30_defconfig | 2 +- configs/riotboard_defconfig | 4 +- configs/rut_defconfig | 6 +- configs/sama5d27_giantboard_defconfig | 4 +- configs/sama5d27_som1_ek_mmc1_defconfig | 4 +- configs/sama5d27_som1_ek_mmc_defconfig | 4 +- configs/sama5d27_som1_ek_qspiflash_defconfig | 4 +- configs/sama5d27_wlsom1_ek_mmc_defconfig | 4 +- .../sama5d27_wlsom1_ek_qspiflash_defconfig | 4 +- configs/sama5d2_icp_mmc_defconfig | 4 +- configs/sama5d2_xplained_emmc_defconfig | 4 +- configs/sama5d2_xplained_mmc_defconfig | 4 +- configs/sama5d2_xplained_qspiflash_defconfig | 4 +- configs/sama5d2_xplained_spiflash_defconfig | 4 +- configs/sama5d3_xplained_mmc_defconfig | 4 +- configs/sama5d3_xplained_nandflash_defconfig | 4 +- configs/sama5d3xek_mmc_defconfig | 4 +- configs/sama5d3xek_nandflash_defconfig | 4 +- configs/sama5d3xek_spiflash_defconfig | 4 +- configs/sama5d4_xplained_mmc_defconfig | 4 +- configs/sama5d4_xplained_nandflash_defconfig | 4 +- configs/sama5d4_xplained_spiflash_defconfig | 4 +- configs/sama5d4ek_mmc_defconfig | 4 +- configs/sama5d4ek_nandflash_defconfig | 4 +- configs/sama5d4ek_spiflash_defconfig | 4 +- configs/seaboard_defconfig | 8 +- configs/seeed_npi_imx6ull_defconfig | 2 +- configs/sifive_unleashed_defconfig | 2 +- configs/sifive_unmatched_defconfig | 2 +- configs/smartweb_defconfig | 4 +- configs/sniper_defconfig | 6 +- configs/socfpga_agilex_atf_defconfig | 8 +- configs/socfpga_agilex_defconfig | 8 +- configs/socfpga_agilex_vab_defconfig | 8 +- configs/socfpga_arria10_defconfig | 8 +- configs/socfpga_chameleonv3_defconfig | 8 +- configs/socfpga_n5x_atf_defconfig | 8 +- configs/socfpga_n5x_defconfig | 8 +- configs/socfpga_n5x_vab_defconfig | 8 +- configs/socfpga_stratix10_atf_defconfig | 8 +- configs/socfpga_stratix10_defconfig | 8 +- configs/starfive_visionfive2_defconfig | 8 +- configs/stm32746g-eval_spl_defconfig | 2 +- configs/stm32f746-disco_spl_defconfig | 2 +- configs/stm32f769-disco_spl_defconfig | 2 +- ...stm32mp15-icore-stm32mp1-ctouch2_defconfig | 8 +- ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig | 8 +- ...-microgea-stm32mp1-microdev2-of7_defconfig | 8 +- ...mp15-microgea-stm32mp1-microdev2_defconfig | 8 +- configs/stm32mp15_basic_defconfig | 8 +- configs/stm32mp15_dhcom_basic_defconfig | 8 +- configs/stm32mp15_dhcor_basic_defconfig | 8 +- configs/syzygy_hub_defconfig | 6 +- configs/taurus_defconfig | 8 +- configs/tec-ng_defconfig | 8 +- configs/tec_defconfig | 8 +- configs/thuban_defconfig | 6 +- configs/topic_miami_defconfig | 4 +- configs/topic_miamilite_defconfig | 4 +- configs/topic_miamiplus_defconfig | 4 +- configs/transformer_t30_defconfig | 8 +- configs/trimslice_defconfig | 8 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/variscite_dart6ul_defconfig | 2 +- configs/venice2_defconfig | 8 +- configs/ventana_defconfig | 8 +- configs/verdin-am62_r5_defconfig | 8 +- configs/verdin-imx8mm_defconfig | 8 +- configs/verdin-imx8mp_defconfig | 8 +- configs/vining_2000_defconfig | 2 +- configs/vyasa-rk3288_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/x3_t30_defconfig | 8 +- configs/xilinx_zynq_virt_defconfig | 6 +- configs/xilinx_zynqmp_mini_emmc0_defconfig | 8 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 8 +- configs/xilinx_zynqmp_mini_qspi_defconfig | 8 +- configs/xilinx_zynqmp_virt_defconfig | 10 +- configs/zynq_cse_nand_defconfig | 8 +- configs/zynq_cse_nor_defconfig | 8 +- configs/zynq_cse_qspi_defconfig | 8 +- doc/arch/sandbox/sandbox.rst | 4 +- doc/develop/devicetree/control.rst | 3 + doc/develop/falcon.rst | 2 +- doc/usage/cmd/bdinfo.rst | 2 +- drivers/core/Kconfig | 14 +- drivers/core/fdtaddr.c | 6 +- drivers/core/of_access.c | 65 +++++ drivers/core/ofnode.c | 183 ++++++++++++- drivers/core/read.c | 6 +- drivers/core/util.c | 2 +- drivers/misc/cros_ec_sandbox.c | 9 +- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_mvebu.c | 3 +- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_mediatek.c | 4 +- drivers/serial/Kconfig | 2 +- drivers/serial/ns16550.c | 15 +- dts/Kconfig | 8 + include/asm-generic/global_data.h | 12 +- include/bloblist.h | 23 ++ include/bootstage.h | 26 ++ include/command.h | 3 + include/configs/socfpga_common.h | 2 +- include/configs/socfpga_soc64_common.h | 2 +- include/dm/fdtaddr.h | 3 +- include/dm/of_access.h | 18 ++ include/dm/ofnode.h | 102 ++++++- include/dm/read.h | 8 +- include/fdtdec.h | 3 +- include/ns16550.h | 4 +- include/of_live.h | 18 ++ include/serial.h | 2 + include/spl.h | 28 +- include/system-constants.h | 20 +- lib/asm-offsets.c | 2 +- lib/fdtdec.c | 44 ++- lib/of_live.c | 141 ++++++++++ test/dm/ofnode.c | 258 ++++++++++++++++-- test/dm/pci.c | 14 +- test/lib/kconfig.c | 4 +- 387 files changed, 2074 insertions(+), 1204 deletions(-) -- 2.42.0.515.g380fc7ccd1-goog

4 49

Pull request: u-boot-rockchip-20231007
by Kever Yang 09 Oct '23

09 Oct '23

Hi Tom, Please pull the updates for rockchip platform: - Add Board: rk3568 Bananapi R2Pro; - Update pcie bifurcation support; - dwc_eth_qos controller support for rk3568 and rk3588; - Compressed binary support for U-Boot on rockchip platform; - dts and config updates for different board and soc; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/18047 Thanks, - Kever The following changes since commit be2abe73df58a35da9e8d5afb13fccdf1b0faa8e: Merge https://source.denx.de/u-boot/custodians/u-boot-riscv (2023-10-05 13:26:44 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20231007 for you to fetch changes up to dd8d52c934e8858264f91e8e8e2d8c7d8b059dd7: rockchip: rk356x-u-boot: Add bootph-all to i2c0_xfer pinctrl node (2023-10-07 16:52:48 +0800) ---------------------------------------------------------------- FUKAUMI Naoki (5): configs: rockchip: rock-pi-s: use default bootdelay (2s) arm: dts: rockchip: sync DT for RK3588 series with Linux arm: dts: rockchip: rock-5b: add support for PCIe3 and NVMe configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY Frank Wunderlich (1): board: rockchip: Add Bananapi R2Pro Board Jonas Karlman (22): pci: pcie_dw_rockchip: Configure number of lanes and link width speed phy: rockchip: snps-pcie3: Refactor to use clk_bulk API phy: rockchip: snps-pcie3: Refactor to use a phy_init ops phy: rockchip: snps-pcie3: Add bifurcation support for RK3568 phy: rockchip: snps-pcie3: Add support for RK3588 phy: rockchip: naneng-combphy: Use signal from comb PHY on RK3588 rockchip: rk3568-nanopi-r5: Update defconfig for NanoPi R5C and R5S rockchip: rk3568-nanopi-r5: Enable PCIe on NanoPi R5C and R5S power: regulator: Only run autoset once for each regulator rockchip: Port IO-domain driver for RK3568 from linux rockchip: board: Add minimal generic RK3566/RK3568 board net: dwc_eth_qos: Drop unused rx_pkt from eqos_priv net: dwc_eth_qos: Return error code when start fails net: dwc_eth_qos: Stop spam of RX packet not available message net: dwc_eth_qos: Add glue driver for GMAC on Rockchip RK3568 net: dwc_eth_qos_rockchip: Add support for RK3588 configs: rockchip: Enable ethernet driver on RK356x boards configs: rockchip: Enable ethernet driver on RK3588 boards power: pmic: rk8xx: Use sysreset implementation of the poweroff command rockchip: rk356x: Enable poweroff command power: pmic: rk8xx: Fix power-on source check in SPL rockchip: rk356x-u-boot: Add bootph-all to i2c0_xfer pinctrl node Joseph Chen (1): regulator: rk8xx: Return correct voltage for buck converters Manoj Sai (4): spl: fit: support for booting a GZIP-compressed U-boot binary spl: fit: support for booting a LZMA-compressed U-boot binary rockchip: Add support to generate GZIP compressed U-boot binary rockchip: Add support to generate LZMA compressed U-boot binary Massimo Pegorer (3): rockchip: Kconfig: Enable external TPL binary for rk3308 doc: rockchip: Update and improve info on rk3308, TPL and TF-A configs: rockchip: add DOS_PARTITION to RK3308 boards defconfig shengfei Xu (1): regulator: rk8xx: Return correct voltage for switchout converters arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi | 19 + arch/arm/dts/rk3568-bpi-r2-pro.dts | 852 +++++++++++++++++++++ arch/arm/dts/rk3568-generic-u-boot.dtsi | 14 + arch/arm/dts/rk3568-generic.dts | 38 + arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi | 4 + arch/arm/dts/rk3568-nanopi-r5c.dts | 2 +- arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 10 +- arch/arm/dts/rk356x-u-boot.dtsi | 8 + arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 1 - arch/arm/dts/rk3588-edgeble-neu6a.dtsi | 1 - arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 6 - arch/arm/dts/rk3588-edgeble-neu6b-io.dts | 66 ++ arch/arm/dts/rk3588-edgeble-neu6b.dtsi | 359 ++++++++- arch/arm/dts/rk3588-evb1-v10.dts | 720 ++++++++++++++++- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 142 ++-- arch/arm/dts/rk3588-rock-5b.dts | 448 ++++++++++- arch/arm/dts/rk3588.dtsi | 215 ++++++ arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 12 - arch/arm/dts/rk3588s-rock-5a.dts | 665 +++++++++++++++- arch/arm/dts/rk3588s-u-boot.dtsi | 162 ---- arch/arm/dts/rk3588s.dtsi | 367 +++++++++ arch/arm/dts/rockchip-u-boot.dtsi | 11 + arch/arm/mach-rockchip/Kconfig | 3 +- board/rockchip/evb_rk3568/MAINTAINERS | 14 + common/spl/spl_fit.c | 20 +- configs/bpi-r2-pro-rk3568_defconfig | 93 +++ configs/evb-rk3308_defconfig | 3 +- configs/evb-rk3568_defconfig | 6 +- configs/evb-rk3588_defconfig | 5 +- configs/generic-rk3568_defconfig | 64 ++ configs/lubancat-2-rk3568_defconfig | 3 + configs/nanopi-r5c-rk3568_defconfig | 18 +- configs/nanopi-r5s-rk3568_defconfig | 22 +- configs/neu6a-io-rk3588_defconfig | 2 - configs/neu6b-io-rk3588_defconfig | 2 - configs/odroid-m1-rk3568_defconfig | 3 + configs/quartz64-a-rk3566_defconfig | 4 + configs/quartz64-b-rk3566_defconfig | 4 + configs/radxa-cm3-io-rk3566_defconfig | 6 +- configs/roc-cc-rk3308_defconfig | 3 +- configs/rock-3a-rk3568_defconfig | 6 +- configs/rock-pi-s-rk3308_defconfig | 5 +- configs/rock5a-rk3588s_defconfig | 5 +- configs/rock5b-rk3588_defconfig | 4 +- configs/soquartz-blade-rk3566_defconfig | 3 + configs/soquartz-cm4-rk3566_defconfig | 3 + configs/soquartz-model-a-rk3566_defconfig | 4 + doc/README.rockchip | 10 +- doc/board/rockchip/rockchip.rst | 45 +- drivers/misc/Kconfig | 9 + drivers/misc/Makefile | 1 + drivers/misc/rockchip-io-domain.c | 167 ++++ drivers/net/Kconfig | 8 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 33 +- drivers/net/dwc_eth_qos.h | 3 +- drivers/net/dwc_eth_qos_rockchip.c | 531 +++++++++++++ drivers/pci/pcie_dw_rockchip.c | 58 +- drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 6 + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 230 ++++-- drivers/power/pmic/Kconfig | 1 + drivers/power/pmic/rk8xx.c | 20 +- drivers/power/regulator/regulator-uclass.c | 18 +- drivers/power/regulator/rk8xx.c | 95 ++- include/configs/rk3308_common.h | 4 +- include/dt-bindings/ata/ahci.h | 20 + include/power/regulator.h | 1 + include/spl.h | 10 + 69 files changed, 5227 insertions(+), 472 deletions(-) create mode 100644 arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-bpi-r2-pro.dts create mode 100644 arch/arm/dts/rk3568-generic-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-generic.dts create mode 100644 configs/bpi-r2-pro-rk3568_defconfig create mode 100644 configs/generic-rk3568_defconfig create mode 100644 drivers/misc/rockchip-io-domain.c create mode 100644 drivers/net/dwc_eth_qos_rockchip.c create mode 100644 include/dt-bindings/ata/ahci.h

3 4

[PATCH] test/py: net: Add dhcp abort test
by Love Kumar 09 Oct '23

09 Oct '23

Abort the dhcp request in the middle by pressing ctrl + c on u-boot prompt and validate the abort status. Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- test/py/tests/test_net.py | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index cd4b4dc53cbc..1e8eb0357eef 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -6,6 +6,7 @@ import pytest import u_boot_utils +import re """ Note: This test relies on boardenv_* containing configuration values to define @@ -104,6 +105,49 @@ def test_net_dhcp(u_boot_console): global net_set_up net_set_up = True +(a)pytest.mark.buildconfigspec("cmd_dhcp") +def test_net_dhcp_abort(u_boot_console): + """Test the dhcp command by pressing ctrl+c in the middle of dhcp request + + The boardenv_* file may be used to enable/disable this test; see the + comment at the beginning of this file. + """ + + test_dhcp = u_boot_console.config.env.get("env__net_dhcp_server", False) + if not test_dhcp: + pytest.skip("No DHCP server available") + + u_boot_console.run_command("setenv autoload no") + + # Phy reset before running dhcp command + output = u_boot_console.run_command("mii device") + eth_num = re.search(r"Current device: '(.+?)'", output).groups()[0] + u_boot_console.run_command(f"mii device {eth_num}") + output = u_boot_console.run_command("mii info") + eth_addr = hex(int(re.search(r"PHY (.+?):", output).groups()[0], 16)) + u_boot_console.run_command(f"mii modify {eth_addr} 0 0x8000 0x8000") + + u_boot_console.run_command("dhcp", wait_for_prompt=False) + try: + u_boot_console.wait_for("Waiting for PHY auto negotiation to complete") + except: + pytest.skip("Timeout waiting for PHY auto negotiation to complete") + + u_boot_console.wait_for("done") + + # Sending Ctrl-C + output = u_boot_console.run_command( + chr(3), wait_for_echo=False, send_nl=False + ) + + assert "TIMEOUT" not in output + assert "DHCP client bound to address " not in output + assert "Abort" in output + + # Provide a time to recover from Abort - if it is not performed + # There is message like: ethernet@ff0e0000: No link. + u_boot_console.run_command("sleep 1") + @pytest.mark.buildconfigspec('cmd_dhcp6') def test_net_dhcp6(u_boot_console): """Test the dhcp6 command. -- 2.25.1

3 2

[PATCH] cli: Consume invalid escape sequences early
by Yurii Monakov 09 Oct '23

09 Oct '23

Hi Simon, On Sun, Oct 8, 2023 at 2:10=E2=80=AFAM Simon Glass <sjg(a)google.com> wrote: > > Hi Yurii, > > On Fri, 6 Oct 2023 at 15:32, Yurii Monakov <monakov.y(a)gmail.com> wrote: > > > > This commit fixes some issues with extra 'Esc' keys entered by user: > > > > 1. Sequence <Esc><Esc><Enter> right after autoboot stop gives: > > =3D> > > nknown command 'ry 'help' > > =3D> > > 2. Sequence <Esc><p><r><i><Enter> gives: > > =3D> ri > > Unknown command 'ri' - try 'help' > > =3D> > > 3. Extra 'Esc' key presses break backspace functionality. > > > > Signed-off-by: Yurii Monakov <monakov.y(a)gmail.com> > > --- > > common/cli_getch.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/common/cli_getch.c b/common/cli_getch.c > > index 61d4cb261b..0ee7908777 100644 > > --- a/common/cli_getch.c > > +++ b/common/cli_getch.c > > @@ -46,6 +46,8 @@ static int cli_ch_esc(struct cli_ch_state *cch, int i= char, > > case 1: > > if (ichar =3D=3D '[' || ichar =3D=3D 'O') > > act =3D ESC_SAVE; > > + else > > + act =3D ESC_CONVERTED; > > break; > > case 2: > > switch (ichar) { > > -- > > 2.34.1 > > > > This is a bit unfortunate. Basically the problem (as I understand it) > is that characters are built up for processing so the expected ichar > =3D=3D 0 is never passed in. > > I think the fix is reasonable. Does it work as well if use: > > else if (ichar =3D=3D '\e') > act =3D ESC_CONVERTED; > > ? > > Also please can you add a test case o test/common/cread.c > > https://u-boot.readthedocs.io/en/latest/develop/tests_sandbox.html > > Regards, > Simon > This is a bit unfortunate. Basically the problem (as I understand it) The main problem is that extra Esc key presses are accumulated internally, even if it is already clear that the current escape sequence is invalid. This results in weird behaviour. For example, the next character after 'Esc= ' key simply disappears from input and 'Unknown command' printed after 'Enter'. Googling "u-boot 'nknown' ry help" gives plenty of such examples. This ofte= n happens when user stops autoboot pressing 'Esc' key. > expected ichar =3D=3D 0 is never passed in IIUYC, this is already checked in the calling function (cli_ch_process). > Does it work as well if use: It was my first fix attempt. But unfortunately it does not work, because if the next character is not valid for the escape sequence it gets swallowed. > Also please can you add a test case o test/common/cread.c It will be quite easy. I've tested this in the sandbox (and with qemu) and was not able to break something with outstanding 'Esc' key presses. Should I resend this patch? Best Regards, Yurii

1 0

[PATCH] test/py: net: Add a TFTP put test
by Love Kumar 09 Oct '23

09 Oct '23

Execute tftpput command for uploading files to a server and validate its size & CRC32. Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- test/py/tests/test_net.py | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index cd4b4dc53cbc..f69e3ea2dbba 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -6,6 +6,7 @@ import pytest import u_boot_utils +import datetime """ Note: This test relies on boardenv_* containing configuration values to define @@ -50,6 +51,7 @@ env__net_tftp_readable_file = { 'addr': 0x10000000, 'size': 5058624, 'crc32': 'c2244b26', + 'timeout': 50000, } # Details regarding a file that may be read from a NFS server. This variable @@ -260,3 +262,70 @@ def test_net_nfs(u_boot_console): output = u_boot_console.run_command('crc32 %x $filesize' % addr) assert expected_crc in output + +(a)pytest.mark.buildconfigspec("cmd_crc32") +(a)pytest.mark.buildconfigspec("cmd_net") +def test_net_tftpput(u_boot_console): + """Test the tftpput command. + A file is downloaded from the TFTP server and then uploaded to the TFTP + server, its size and its CRC32 are validated. + The details of the file to download are provided by the boardenv_* file; + see the comment at the beginning of this file. + """ + + if not net_set_up: + pytest.skip("Network not initialized") + + f = u_boot_console.config.env.get("env__net_tftp_readable_file", None) + if not f: + pytest.skip("No TFTP readable file to read") + + addr = f.get("addr", None) + if not addr: + addr = u_boot_utils.find_ram_base(u_boot_console) + + sz = f.get("size", None) + timeout = f.get("timeout", u_boot_console.p.timeout) + fn = f["fn"] + fnu = "_".join([datetime.datetime.now().strftime("%y%m%d%H%M%S"), fn]) + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command("tftpboot %x %s" % (addr, fn)) + + assert "TIMEOUT" not in output + assert expected_text in output + + expected_tftpb_crc = f.get("crc32", None) + + output = u_boot_console.run_command("crc32 $fileaddr $filesize") + assert expected_tftpb_crc in output + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command( + "tftpput $fileaddr $filesize $serverip:%s" % (fnu) + ) + + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + addr = addr + sz + assert "TIMEOUT" not in output + assert "Access violation" not in output + assert expected_text in output + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command("tftpboot %x %s" % (addr, fnu)) + + expected_text = "Bytes transferred = " + if sz: + expected_text += "%d" % sz + assert "TIMEOUT" not in output + assert expected_text in output + + expected_tftpp_crc = expected_tftpb_crc + + output = u_boot_console.run_command("crc32 $fileaddr $filesize") + assert expected_tftpp_crc in output -- 2.25.1

3 2

[PATCH] net: phy: xilinx_phy: Get rid of using property xlnx, phy-type
by Venkatesh Yadav Abbarapu 09 Oct '23

09 Oct '23

As the xlnx,phy-type device tree property is deprecated and phy-mode is being used, so removing the code references of xlnx,phy-type. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- drivers/net/phy/xilinx_phy.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c index 1df639d6f4..50f1611ad5 100644 --- a/drivers/net/phy/xilinx_phy.c +++ b/drivers/net/phy/xilinx_phy.c @@ -107,10 +107,6 @@ static int xilinxphy_of_init(struct phy_device *phydev) if (!ofnode_valid(node)) return -EINVAL; - phytype = ofnode_read_u32_default(node, "xlnx,phy-type", -1); - if (phytype == XAE_PHY_TYPE_1000BASE_X) - phydev->flags |= XAE_PHY_TYPE_1000BASE_X; - return 0; } -- 2.17.1

2 2