diff options
38 files changed, 865 insertions, 278 deletions
@@ -76,6 +76,7 @@ Marek Vasut <marex@denx.de> <marex at denx.de> Markus Klotzbuecher <mk@denx.de> Masahiro Yamada <masahiroy@kernel.org> <yamada.masahiro@socionext.com> Masahiro Yamada <masahiroy@kernel.org> <yamada.m@jp.panasonic.com> +Mattijs Korpershoek <mkorpershoek@kernel.org> <mkorpershoek@baylibre.com> Michal Simek <michal.simek@amd.com> <Monstr@seznam.cz> Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com> Michal Simek <michal.simek@amd.com> <monstr@monstr.eu> diff --git a/MAINTAINERS b/MAINTAINERS index fac9ce81d70..a0b06e9ee24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -66,7 +66,7 @@ F: lib/alist.c F: test/lib/alist.c ANDROID AB -M: Mattijs Korpershoek <mkorpershoek@baylibre.com> +M: Mattijs Korpershoek <mkorpershoek@kernel.org> R: Igor Opaniuk <igor.opaniuk@gmail.com> R: Sam Protsenko <semen.protsenko@linaro.org> S: Maintained @@ -77,7 +77,7 @@ F: include/android_ab.h F: test/py/tests/test_android/test_ab.py ANDROID AVB -M: Mattijs Korpershoek <mkorpershoek@baylibre.com> +M: Mattijs Korpershoek <mkorpershoek@kernel.org> R: Igor Opaniuk <igor.opaniuk@gmail.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git @@ -987,7 +987,7 @@ F: net/eth_bootdevice.c F: test/boot/ BOOTMETH_ANDROID -M: Mattijs Korpershoek <mkorpershoek@baylibre.com> +M: Mattijs Korpershoek <mkorpershoek@kernel.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git F: boot/bootmeth_android.c @@ -1066,7 +1066,7 @@ N: OF_UPSTREAM DFU M: Lukasz Majewski <lukma@denx.de> -M: Mattijs Korpershoek <mkorpershoek@baylibre.com> +M: Mattijs Korpershoek <mkorpershoek@kernel.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git F: cmd/dfu.c @@ -1178,7 +1178,7 @@ F: test/common/event.c F: test/py/tests/test_event_dump.py FASTBOOT -M: Mattijs Korpershoek <mkorpershoek@baylibre.com> +M: Mattijs Korpershoek <mkorpershoek@kernel.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git F: cmd/fastboot.c @@ -3,7 +3,7 @@ VERSION = 2025 PATCHLEVEL = 04 SUBLEVEL = -EXTRAVERSION = -rc5 +EXTRAVERSION = NAME = # *DOCUMENTATION* diff --git a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c index e45cfd5d8a3..294f78858a7 100644 --- a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c +++ b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c @@ -29,7 +29,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); diff --git a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c index 94cf5b4361f..1ec9a5b401e 100644 --- a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +++ b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c @@ -36,7 +36,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); diff --git a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c index f641db5a494..b552035ee03 100644 --- a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c +++ b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c @@ -29,7 +29,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); diff --git a/board/openpiton/riscv64/Kconfig b/board/openpiton/riscv64/Kconfig index 21da1dc346d..e4bd8903aab 100644 --- a/board/openpiton/riscv64/Kconfig +++ b/board/openpiton/riscv64/Kconfig @@ -35,6 +35,5 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply SPL_SMP imply SPL_MMC imply SMP - imply SPL_RISCV_MMODE endif diff --git a/board/starfive/visionfive2/Kconfig b/board/starfive/visionfive2/Kconfig index d7e8a7a7d78..2186a939646 100644 --- a/board/starfive/visionfive2/Kconfig +++ b/board/starfive/visionfive2/Kconfig @@ -50,13 +50,4 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply PHY_LIB imply PHY_MSCC -config STARFIVE_NO_EMMC - bool "Report eMMC size as zero" - help - The serial number string in the EEPROM is meant to report the - size of onboard eMMC. Unfortunately some Milk-V Mars CM Lite - modules without eMMC show a non-zero size here. - - Set to 'Y' if you have a Mars CM Lite module. - endif diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 13a48939c8f..3e4d3e21988 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -137,14 +137,6 @@ int board_fit_config_name_match(const char *name) } else if (!strncmp(product_id, "MARS", 4) && !strcmp(name, "jh7110-milkv-mars")) { return 0; - } else if (!strncmp(product_id, "MARC", 4)) { - if (!get_mmc_size_from_eeprom()) { - if (!strcmp(name, "jh7110-milkv-mars-cm-lite")) - return 0; - } else { - if (!strcmp(name, "jh7110-milkv-mars-cm")) - return 0; - } } else if (!strncmp(product_id, "STAR64", 6) && !strcmp(name, "jh7110-pine64-star64")) { return 0; diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 3940d45b13f..b8cd509bc89 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -19,10 +19,6 @@ DECLARE_GLOBAL_DATA_PTR; #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000 #define FDTFILE_MILK_V_MARS \ "starfive/jh7110-milkv-mars.dtb" -#define FDTFILE_MILK_V_MARS_CM \ - "starfive/jh7110-milkv-mars-cm.dtb" -#define FDTFILE_MILK_V_MARS_CM_LITE \ - "starfive/jh7110-milkv-mars-cm-lite.dtb" #define FDTFILE_VISIONFIVE2_1_2A \ "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb" #define FDTFILE_VISIONFIVE2_1_3B \ @@ -67,12 +63,7 @@ static void set_fdtfile(void) log_err("Can't read EEPROM\n"); return; } - if (!strncmp(product_id, "MARC", 4)) { - if (get_mmc_size_from_eeprom()) - fdtfile = FDTFILE_MILK_V_MARS_CM; - else - fdtfile = FDTFILE_MILK_V_MARS_CM_LITE; - } else if (!strncmp(product_id, "MARS", 4)) { + if (!strncmp(product_id, "MARS", 4)) { fdtfile = FDTFILE_MILK_V_MARS; } else if (!strncmp(product_id, "VF7110", 6)) { version = get_pcb_revision_from_eeprom(); diff --git a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c index 838f41e41bd..010e386e64d 100644 --- a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c +++ b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c @@ -573,9 +573,6 @@ u32 get_mmc_size_from_eeprom(void) { u32 size; - if (IS_ENABLED(CONFIG_STARFIVE_NO_EMMC)) - return 0; - if (read_eeprom()) return 0; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 774ef7ac5e3..f738cba7bd1 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -955,7 +955,8 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_bone() && !strcmp(name, "am335x-bone")) return 0; - else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack")) + else if (board_is_bone_lt() && !board_is_bbg1() && + !strcmp(name, "am335x-boneblack")) return 0; else if (board_is_pb() && !strcmp(name, "am335x-pocketbeagle")) return 0; diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index b91e61bcbc4..6e5e0f99ea4 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -73,6 +73,10 @@ static int extlinux_pxe_read_bootflow(struct udevice *dev, return log_msg_ret("pxeb", -EPERM); addr = simple_strtoul(addr_str, NULL, 16); + ret = dhcp_run(addr, NULL, false); + if (ret) + return log_msg_ret("dhc", ret); + log_debug("calling pxe_get()\n"); ret = pxe_get(addr, &bootdir, &size, false); log_debug("pxe_get() returned %d\n", ret); diff --git a/cmd/Kconfig b/cmd/Kconfig index ddffa81613a..ecef664fcea 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1842,12 +1842,10 @@ menuconfig CMD_NET bool "Network commands" default y -endif +if CMD_NET if NET -if CMD_NET - config CMD_BOOTP bool "bootp" default y @@ -2088,7 +2086,6 @@ config IPV6_ROUTER_DISCOVERY help Will automatically perform router solicitation on first IPv6 network operation -endif # if CMD_NET config CMD_ETHSW bool "ethsw" @@ -2105,10 +2102,6 @@ config CMD_WOL endif # if NET -if NET || NET_LWIP - -if CMD_NET - config CMD_DHCP bool "dhcp" select PROT_DHCP_LWIP if NET_LWIP @@ -2206,8 +2199,6 @@ config WGET_BUILTIN_CACERT_PATH Certification Authority certificates, a.k.a. root certificates, for the purpose of authenticating HTTPS connections. -endif # if CMD_NET - config CMD_PXE bool "pxe" select PXE_UTILS @@ -2215,7 +2206,9 @@ config CMD_PXE help Boot image via network using PXE protocol -endif # if NET || NET_LWIP +endif # if CMD_NET + +endif # NET || NET_LWIP menu "Misc commands" diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index 58c10fbec7d..cecf8d02555 100644 --- a/cmd/net-lwip.c +++ b/cmd/net-lwip.c @@ -17,7 +17,7 @@ U_BOOT_CMD(ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host", #if defined(CONFIG_CMD_TFTPBOOT) U_BOOT_CMD(tftpboot, 3, 0, do_tftpb, - "boot image via network using TFTP protocol\n", + "boot image via network using TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]"); #endif diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig index ad1621a94dd..0b7940f4fb4 100644 --- a/configs/sama5d27_giantboard_defconfig +++ b/configs/sama5d27_giantboard_defconfig @@ -14,6 +14,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_giantboard" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -84,6 +85,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig index bb29121bb15..2e5a4acf27d 100644 --- a/configs/sama5d27_som1_ek_mmc1_defconfig +++ b/configs/sama5d27_som1_ek_mmc1_defconfig @@ -14,6 +14,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_som1_ek" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -93,6 +94,7 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig index 308aafc7dfe..11a536d714c 100644 --- a/configs/sama5d27_som1_ek_mmc_defconfig +++ b/configs/sama5d27_som1_ek_mmc_defconfig @@ -15,6 +15,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_som1_ek" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -93,6 +94,7 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig index ac14dd53838..86cb5c287be 100644 --- a/configs/sama5d27_som1_ek_qspiflash_defconfig +++ b/configs/sama5d27_som1_ek_qspiflash_defconfig @@ -15,6 +15,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_som1_ek" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -92,6 +93,7 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig index 6db27280f0f..014f0093eee 100644 --- a/configs/sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig @@ -13,6 +13,7 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_wlsom1_ek" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -99,6 +100,7 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig index 76556526516..efe23115f62 100644 --- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig +++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig @@ -14,6 +14,7 @@ CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_wlsom1_ek" CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -103,6 +104,7 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_RESET_AT91=y CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y diff --git a/doc/README.pxe b/doc/README.pxe index af2e64a5776..9fff2cd5ae9 100644 --- a/doc/README.pxe +++ b/doc/README.pxe @@ -160,7 +160,7 @@ kernel <path> - if this label is chosen, use tftp to retrieve the kernel It will passed to bootm with that address. (see: doc/uImage.FIT/command_syntax_extensions.txt) It useful for overlay selection in pxe file - (see: doc/uImage.FIT/overlay-fdt-boot.txt) + (see: doc/usage/fit/overlay-fdt-boot.rst). fdtoverlays <path> [...] - if this label is chosen, use tftp to retrieve the DT overlay(s) at <path>. it will be temporarily stored at the diff --git a/doc/board/starfive/index.rst b/doc/board/starfive/index.rst index 72ab6ddfbf6..2cba1b6dc56 100644 --- a/doc/board/starfive/index.rst +++ b/doc/board/starfive/index.rst @@ -7,6 +7,5 @@ StarFive :maxdepth: 1 milk-v_mars - milk-v_mars_cm pine64_star64 visionfive2 diff --git a/doc/board/starfive/milk-v_mars_cm.rst b/doc/board/starfive/milk-v_mars_cm.rst deleted file mode 100644 index 52d4e5e9098..00000000000 --- a/doc/board/starfive/milk-v_mars_cm.rst +++ /dev/null @@ -1,193 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0+ - -Milk-V Mars CM -============== - -U-Boot for the Milk-V Mars CM uses the same U-Boot binaries as the VisionFive 2 -board. In U-Boot SPL the actual board is detected and the device-tree patched -accordingly. - -The Milk-V Mars CM Lite comes without eMMC and needs a different pin muxing -than the Milk-V Mars CM. The availability and size of the eMMC shows up in the -serial number displayed by the *mac* command, e.g. -MARC-V10-2340-D002E016-00000304. The number after the E is the MMC size. U-Boot -takes a value of E000 as an indicator for the Lite version. Unfortunately the -vendor has not set this value correctly on some Lite boards. - -Please, use CONFIG_STARFIVE_NO_EMMC=y if EEPROM data indicates eMMC is present -on the Milk-V Mars CM Lite. Otherwise you will not be able to read from the -SD-card. - -The serial number can be corrected using the *mac* command: - -.. code-block:: - - mac read_eeprom - mac product_id MARC-V10-2340-D002E000-00000304 - mac write_eeprom - -.. note:: - - The *mac initialize* command overwrites the vendor string and the MAC - addresses. This is why it is avoided here. - -By default the EEPROM is write protected. The write protection may be overcome -by connecting the "GND" and "EN" test pads on top of the module. - -Building -~~~~~~~~ - -1. Add the RISC-V toolchain to your PATH. -2. Setup ARCH & cross compilation environment variable: - -.. code-block:: none - - export CROSS_COMPILE=<riscv64 toolchain prefix> - -The M-mode software OpenSBI provides the supervisor binary interface (SBI) and -is responsible for the switch to S-Mode. It is a prerequisite to build U-Boot. -Support for the JH7110 was introduced in OpenSBI 1.2. It is recommended to use -a current release. - -.. code-block:: console - - git clone https://github.com/riscv/opensbi.git - cd opensbi - make PLATFORM=generic FW_TEXT_START=0x40000000 - -(*FW_TEXT_START* is not needed anymore after OpenSBI patch d4d2582eef7a -"firmware: remove FW_TEXT_START" which should appear in OpenSBI 1.5.) - -Now build the U-Boot SPL and U-Boot proper. - -.. code-block:: console - - cd <U-Boot-dir> - make starfive_visionfive2_defconfig - make OPENSBI=$(opensbi_dir)/build/platform/generic/firmware/fw_dynamic.bin - -This will generate the U-Boot SPL image (spl/u-boot-spl.bin.normal.out) as well -as the FIT image (u-boot.itb) with OpenSBI and U-Boot. - -Device-tree selection -~~~~~~~~~~~~~~~~~~~~~ - -Depending on the board version U-Boot sets variable $fdtfile to either -starfive/jh7110-milkv-mars-cm.dtb (with eMMC storage) or -starfive/jh7110-milkv-mars-cm-lite.dtb (without eMMC storage). - -To overrule this selection the variable can be set manually and saved in the -environment - -:: - - env set fdtfile my_device-tree.dtb - env save - -or the configuration variable CONFIG_DEFAULT_FDT_FILE can be used to set to -provide a default value. - -The variable *$fdtfile* is used in the boot process to automatically load -a device-tree provided by the operating system. For details of the boot -process refer to the :doc:`/develop/bootstd/index` -description. - -Boot source selection -~~~~~~~~~~~~~~~~~~~~~ - -The low speed connector nRPIBOOT line is used to switch the boot source. - -* If nRPIBOOT is connected to ground, the board boots from UART. -* If nRPIBOOT is not connected, the board boots from SPI flash. - -Compute module boards typically have a switch or jumper for this line. - -Flashing a new U-Boot version -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -U-Boot SPL is provided as file spl/u-boot-spl.bin.normal.out. Main U-Boot is -in file u-boot.itb. - -Assuming your new U-Boot version is on partition 1 of an SD-card you could -install it to the SPI flash with: - -:: - - sf probe - load mmc 0:1 $kernel_addr_r u-boot-spl.bin.normal.out - sf update $kernel_addr_r 0 $filesize - load mmc 0:1 $kernel_addr_r u-boot.itb - sf update $kernel_addr_r 0x100000 $filesize - -For loading the files from a TFTP server refer to the dhcp and tftpboot -commands. - -After updating U-Boot you may want to reboot and reset the environment to the -default. - -:: - - env default -f -a - env save - -Booting from UART -~~~~~~~~~~~~~~~~~ - -For booting via UART U-Boot must be built with CONFIG_SPL_YMODEM_SUPPORT=y. - -With nRPIBOOT connected to ground for UART boot, power the board and upload -u-boot-spl.bin.normal.out via XMODEM. Then upload u-boot.itb via YMODEM. - -The XMODEM implementation in the boot ROM is not fully specification compliant. -It sends too many NAKs in a row. Tio is a terminal emulation that tolerates -these faults. - -:: - - $ tio -b 115200 --databits 8 --flow none --stopbits 1 /dev/ttyUSB0 - [08:14:54.700] tio v2.7 - [08:14:54.700] Press ctrl-t q to quit - [08:14:54.701] Connected - - (C)StarFive - CCC - (C)StarFive - CCCCCCCC - -Press *ctrl-t x* to initiate XMODEM-1K transfer. - -:: - - [08:15:14.778] Send file with XMODEM - [08:15:22.459] Sending file 'u-boot-spl.bin.normal.out' - [08:15:22.459] Press any key to abort transfer - ........................................................................ - .......................................................................| - [08:15:22.459] Done - - U-Boot SPL 2024.07-rc1-00075-gd6a4ab20097 (Apr 25 2024 - 16:32:10 +0200) - DDR version: dc2e84f0. - Trying to boot from UART - CC - -Press *ctrl-t y* to initiate YMODEM transfer. - -:: - - [08:15:50.331] Send file with YMODEM - [08:15:53.540] Sending file 'u-boot.itb' - [08:15:53.540] Press any key to abort transfer - ........................................................................ - … - ...............| - [08:15:53.540] Done - Loaded 1040599 bytes - - - U-Boot 2024.07-rc1-00075-gd6a4ab20097 (Apr 25 2024 - 16:32:10 +0200) - -Booting from SPI flash -~~~~~~~~~~~~~~~~~~~~~~ - -With nRPIBOOT disconnected from ground for SPI boot, power up the board. You -should see the U-Boot prompt on the serial console. diff --git a/doc/build/docker.rst b/doc/build/docker.rst index 01ed3505090..4974a98d4af 100644 --- a/doc/build/docker.rst +++ b/doc/build/docker.rst @@ -12,7 +12,9 @@ You will need a multi-platform container, otherwise this error is shown:: ERROR: Multi-platform build is not supported for the docker driver. Switch to a different driver, or turn on the containerd image store, and try again. -You can add a simple one with:: +You can add a simple one with: + +.. code-block:: bash sudo docker buildx create --name multiarch --driver docker-container --use @@ -20,7 +22,9 @@ This will result in a builder that will use QEMU for the non-native architectures request in a build. While both amd64 and arm64 happen in parallel, the non-native part will take considerably longer as it must use QEMU to emulate the foreign code. An alternative, if you have accesss to reasonably -fast amd64 (i.e. 64-bit x86) and arm64 machines is:: +fast amd64 (i.e. 64-bit x86) and arm64 machines is: + +.. code-block:: bash sudo docker buildx create --name multiarch-multinode --node localNode --bootstrap --use sudo docker buildx create --name multiarch-multinode --append --node remoteNode --bootstrap ssh://user@host @@ -28,7 +32,7 @@ fast amd64 (i.e. 64-bit x86) and arm64 machines is:: And this will result in a builder named multiarch-multinode that will build each platform natively on each node. -To build the image yourself:: +To build the image yourself: .. code-block:: bash diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index e736dc0616e..b108f9b11e0 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -51,14 +51,15 @@ Examples:: Current Status -------------- -* U-Boot v2025.01 was released on Mon 06 January 2025. +* U-Boot v2025.04 was released on Monday, 07 April 2025. -* The Merge Window for the next release (v2025.04) is **closed**. +* The Merge Window for the next release (v2025.04) is **open** until the -rc1 + release on Monday, 28 April 2025. -* The next branch is now **open** with the -rc2 release on Mon 10 February +* The next branch is now **closed** until the -rc2 release on Monday, 12 May 2025. -* Release "v2025.04" is scheduled for 07 April 2025. +* Release "v2025.07" is scheduled for Monday, 07 July 2025. Future Releases --------------- @@ -66,28 +67,28 @@ Future Releases .. The following commented out dates are for when release candidates are planned to be tagged. -For the next scheduled release, release candidates were made on:: +.. For the next scheduled release, release candidates were made on:: -* U-Boot v2025.04-rc1 was released on Mon 27 January 2025. +.. * U-Boot v2025.07-rc1 was released on Mon 21 April 2025. -* U-Boot v2025.04-rc2 was released on Mon 10 February 2025. +.. * U-Boot v2025.07-rc2 was released on Mon 12 May 2025. -* U-Boot v2025.04-rc3 was released on Mon 24 February 2025. +.. * U-Boot v2025.07-rc3 was released on Mon 26 May 2025. -* U-Boot v2025.04-rc4 was released on Mon 10 March 2025. +.. * U-Boot v2025.07-rc4 was released on Mon 09 June 2025. -* U-Boot v2025.04-rc5 was released on Mon 24 March 2025. +.. * U-Boot v2025.07-rc5 was released on Mon 23 June 2025. Please note that the following dates are planned only and may be deviated from as needed. -* "v2025.04": end of MW = Mon, Jan 27, 2025; release = Mon, Apr 07, 2025 +* "v2025.07": end of MW = Mon, Apr 28, 2025; release = Mon, Jul 07, 2025 -* "v2025.07": end of MW = Mon, Apr 21, 2025; release = Mon, Jul 07, 2025 +* "v2025.10": end of MW = Mon, Jul 28, 2025; release = Mon, Oct 06, 2025 -* "v2025.10": end of MW = Mon, Jul 21, 2025; release = Mon, Oct 06, 2025 +* "v2026.01": end of MW = Mon, Oct 27, 2025; release = Mon, Jan 05, 2026 -* "v2026.01": end of MW = Mon, Oct 20, 2025; release = Mon, Jan 05, 2026 +* "v2025.04": end of MW = Mon, Jan 26, 2026; release = Mon, Apr 06, 2026 Previous Releases ----------------- @@ -96,6 +97,8 @@ Note: these statistics are generated by our fork of `gitdm <https://source.denx.de/u-boot/gitdm>`_, which was originally created by Jonathan Corbet. +* :doc:`statistics/u-boot-stats-v2025.04` which was released on 07 April 2025. + * :doc:`statistics/u-boot-stats-v2025.01` which was released on 06 January 2025. * :doc:`statistics/u-boot-stats-v2024.10` which was released on 07 October 2024. diff --git a/doc/develop/statistics/u-boot-stats-v2025.04.rst b/doc/develop/statistics/u-boot-stats-v2025.04.rst new file mode 100644 index 00000000000..47944616e25 --- /dev/null +++ b/doc/develop/statistics/u-boot-stats-v2025.04.rst @@ -0,0 +1,788 @@ +:orphan: + +Release Statistics for U-Boot v2025.04 +====================================== + +* Processed 1264 changesets from 176 developers + +* 25 employers found + +* A total of 221825 lines added, 99018 removed (delta 122807) + +.. table:: Developers with the most changesets + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Simon Glass 222 (17.6%) + Marek Vasut 106 (8.4%) + Jonas Karlman 69 (5.5%) + Heinrich Schuchardt 58 (4.6%) + Tom Rini 51 (4.0%) + Weijie Gao 40 (3.2%) + Michal Simek 31 (2.5%) + Peng Fan 29 (2.3%) + Raymond Mao 26 (2.1%) + Adriano Cordova 25 (2.0%) + Patrice Chotard 23 (1.8%) + Ilias Apalodimas 22 (1.7%) + Neil Armstrong 19 (1.5%) + Heiko Schocher 17 (1.3%) + Christian Marangi 15 (1.2%) + Hal Feng 14 (1.1%) + Sam Protsenko 14 (1.1%) + J. Neuschäfer 13 (1.0%) + Svyatoslav Ryhel 13 (1.0%) + Venkatesh Yadav Abbarapu 12 (0.9%) + Mikhail Kshevetskiy 12 (0.9%) + Jerome Forissier 9 (0.7%) + Stefan Eichenberger 9 (0.7%) + Daniel Schultz 9 (0.7%) + Caleb Connolly 9 (0.7%) + Santhosh Kumar K 9 (0.7%) + Philippe Reynes 9 (0.7%) + Paul HENRYS 9 (0.7%) + Tianling Shen 8 (0.6%) + Wadim Egorov 8 (0.6%) + Neha Malcom Francis 8 (0.6%) + Vaishnav Achath 8 (0.6%) + Andre Przywara 7 (0.6%) + Yannic Moog 7 (0.6%) + Udit Kumar 6 (0.5%) + Judith Mendez 6 (0.5%) + Andrew Goodbody 6 (0.5%) + Ibai Erkiaga 6 (0.5%) + Tim Harvey 6 (0.5%) + Manorit Chawdhry 6 (0.5%) + Evgeny Bachinin 6 (0.5%) + Yuri Zaporozhets 6 (0.5%) + Richard Weinberger 6 (0.5%) + Guillaume La Roque 6 (0.5%) + Enrico Leto 6 (0.5%) + Varadarajan Narayanan 5 (0.4%) + Jayesh Choudhary 5 (0.4%) + Junhui Liu 5 (0.4%) + Christoph Niedermaier 5 (0.4%) + Fabio Estevam 4 (0.3%) + Yao Zi 4 (0.3%) + Sam Edwards 4 (0.3%) + Ye Li 4 (0.3%) + Padmarao Begari 4 (0.3%) + Liya Huang 4 (0.3%) + Siddharth Vadapalli 4 (0.3%) + Michael Chang 4 (0.3%) + Love Kumar 4 (0.3%) + Alexander Dahl 4 (0.3%) + Boon Khai Ng 4 (0.3%) + Bryan Brattlof 4 (0.3%) + Alexander Sverdlin 4 (0.3%) + Aparna Patra 4 (0.3%) + Garrett Giordano 4 (0.3%) + Yunus Bas 4 (0.3%) + Reid Tonking 4 (0.3%) + Zixun LI 4 (0.3%) + Alexey Romanov 4 (0.3%) + Leonard Anderweit 3 (0.2%) + Mattijs Korpershoek 3 (0.2%) + E Shattow 3 (0.2%) + Sam Day 3 (0.2%) + Johan Jonker 3 (0.2%) + Paul Kocialkowski 3 (0.2%) + Anurag Dutta 3 (0.2%) + Yu-Chien Peter Lin 3 (0.2%) + Duje Mihanović 3 (0.2%) + david regan 3 (0.2%) + Dmitry Rokosov 3 (0.2%) + FUKAUMI Naoki 3 (0.2%) + Maksim Kiselev 3 (0.2%) + Thomas Bonnefille 3 (0.2%) + Christoph Stoidner 3 (0.2%) + Rasmus Villemoes 3 (0.2%) + Heiko Stuebner 2 (0.2%) + Vincent Stehlé 2 (0.2%) + Fiona Klute 2 (0.2%) + Benjamin Lemouzy 2 (0.2%) + Maks Mishin 2 (0.2%) + Patrick Delaunay 2 (0.2%) + Aashvij Shenai 2 (0.2%) + Prasad Kummari 2 (0.2%) + Sam Shih 2 (0.2%) + Mark Tomlinson 2 (0.2%) + Rufus Segar 2 (0.2%) + Jim Liu 2 (0.2%) + Andrey Skvortsov 2 (0.2%) + Christopher Obbard 2 (0.2%) + Alice Guo 2 (0.2%) + Mayuresh Chitale 2 (0.2%) + Shree Ramamoorthy 2 (0.2%) + Lothar Rubusch 2 (0.2%) + Frank Sae 2 (0.2%) + Kongyang Liu 2 (0.2%) + Gokul Praveen 2 (0.2%) + Benedikt Spranger 2 (0.2%) + Andrew Davis 1 (0.1%) + Quentin Schulz 1 (0.1%) + Paul Barker 1 (0.1%) + Michael Walle 1 (0.1%) + Kory Maincent 1 (0.1%) + Ben Schneider 1 (0.1%) + Hendrik Donner 1 (0.1%) + Peter Robinson 1 (0.1%) + Martin Stolpe 1 (0.1%) + Andrea della Porta 1 (0.1%) + Diederik de Haas 1 (0.1%) + Sumit Garg 1 (0.1%) + Greg Malysa 1 (0.1%) + Kever Yang 1 (0.1%) + Justin Klaassen 1 (0.1%) + Julius Lehmann 1 (0.1%) + Joao Marcos Costa 1 (0.1%) + Chen-Yu Tsai 1 (0.1%) + Gao Xiang 1 (0.1%) + ZHANG Yuntian 1 (0.1%) + Nathan Morrisson 1 (0.1%) + Michael Ferolito 1 (0.1%) + Benjamin Szőke 1 (0.1%) + John Crispin 1 (0.1%) + Huan Zhou 1 (0.1%) + Josua Mayer 1 (0.1%) + Tony Dinh 1 (0.1%) + Michael Trimarchi 1 (0.1%) + Alif Zakuan Yuslaimi 1 (0.1%) + Muhammad Hazim Izzat Zamri 1 (0.1%) + Julien Masson 1 (0.1%) + Igor Opaniuk 1 (0.1%) + Aaron Kling 1 (0.1%) + Chanho Park 1 (0.1%) + Ronald Wahl 1 (0.1%) + Vignesh Raghavendra 1 (0.1%) + Tengfei Fan 1 (0.1%) + Patrick Rudolph 1 (0.1%) + Jonathan Humphreys 1 (0.1%) + Roger Quadros 1 (0.1%) + Beleswar Padhi 1 (0.1%) + Jesse Taube 1 (0.1%) + Norbert van Bolhuis 1 (0.1%) + Andy Yan 1 (0.1%) + Sébastien Szymanski 1 (0.1%) + Georgi Vlaev 1 (0.1%) + Vincent Fazio 1 (0.1%) + Jonathan Stroud 1 (0.1%) + Neal Frager 1 (0.1%) + Naman Trivedi 1 (0.1%) + Daniel Semkowicz 1 (0.1%) + Cristian Ciocaltea 1 (0.1%) + Jacobe Zang 1 (0.1%) + Yang Gang 1 (0.1%) + Olivier L'Heureux 1 (0.1%) + Aleksandar Gerasimovski 1 (0.1%) + Sean Edmond 1 (0.1%) + Markus Gothe 1 (0.1%) + Prasanth Babu Mantena 1 (0.1%) + Meng Li 1 (0.1%) + Hiago De Franco 1 (0.1%) + Randolph 1 (0.1%) + Marcus Folkesson 1 (0.1%) + Christoph Fritz 1 (0.1%) + Aswath Govindraju 1 (0.1%) + Vitor Soares 1 (0.1%) + Keerthy 1 (0.1%) + Théo Lebrun 1 (0.1%) + Aniket Limaye 1 (0.1%) + Alessandro Zini 1 (0.1%) + ==================================== ===== + + +.. table:: Developers with the most changed lines + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Tom Rini 140936 (51.6%) + Heinrich Schuchardt 18527 (6.8%) + Peng Fan 12959 (4.7%) + Andre Przywara 11041 (4.0%) + Marek Vasut 10096 (3.7%) + Weijie Gao 7532 (2.8%) + Garrett Giordano 6803 (2.5%) + Simon Glass 6197 (2.3%) + Patrick Rudolph 6036 (2.2%) + Jonas Karlman 4841 (1.8%) + Johan Jonker 3953 (1.4%) + Bryan Brattlof 3220 (1.2%) + Raymond Mao 3169 (1.2%) + Neil Armstrong 3003 (1.1%) + Adriano Cordova 2387 (0.9%) + Hal Feng 2328 (0.9%) + Mikhail Kshevetskiy 1740 (0.6%) + Patrick Delaunay 1409 (0.5%) + Michal Simek 1176 (0.4%) + Christoph Stoidner 1112 (0.4%) + Alexey Romanov 1109 (0.4%) + FUKAUMI Naoki 1079 (0.4%) + Svyatoslav Ryhel 1027 (0.4%) + Udit Kumar 1020 (0.4%) + Boon Khai Ng 930 (0.3%) + Enrico Leto 886 (0.3%) + Kongyang Liu 772 (0.3%) + Mayuresh Chitale 771 (0.3%) + Varadarajan Narayanan 716 (0.3%) + Sam Shih 705 (0.3%) + Philippe Reynes 702 (0.3%) + Tianling Shen 656 (0.2%) + Christian Marangi 635 (0.2%) + Patrice Chotard 538 (0.2%) + david regan 529 (0.2%) + Maksim Kiselev 519 (0.2%) + Richard Weinberger 472 (0.2%) + Junhui Liu 443 (0.2%) + Ilias Apalodimas 438 (0.2%) + Santhosh Kumar K 420 (0.2%) + Love Kumar 418 (0.2%) + Duje Mihanović 384 (0.1%) + Heiko Schocher 381 (0.1%) + Venkatesh Yadav Abbarapu 381 (0.1%) + Caleb Connolly 379 (0.1%) + Paul HENRYS 379 (0.1%) + Manorit Chawdhry 359 (0.1%) + Christoph Niedermaier 357 (0.1%) + Wadim Egorov 342 (0.1%) + E Shattow 332 (0.1%) + Markus Gothe 320 (0.1%) + Alice Guo 295 (0.1%) + Stefan Eichenberger 281 (0.1%) + Thomas Bonnefille 275 (0.1%) + Jacobe Zang 272 (0.1%) + Sam Protsenko 239 (0.1%) + Sam Edwards 236 (0.1%) + Daniel Schultz 232 (0.1%) + Jayesh Choudhary 221 (0.1%) + Guillaume La Roque 213 (0.1%) + Aparna Patra 210 (0.1%) + Frank Sae 183 (0.1%) + Jim Liu 148 (0.1%) + J. Neuschäfer 142 (0.1%) + Michael Chang 135 (0.0%) + Yannic Moog 131 (0.0%) + Michael Trimarchi 130 (0.0%) + Lothar Rubusch 122 (0.0%) + Vitor Soares 117 (0.0%) + Jerome Forissier 115 (0.0%) + Georgi Vlaev 114 (0.0%) + Dmitry Rokosov 109 (0.0%) + Alexander Dahl 106 (0.0%) + Zixun LI 99 (0.0%) + Yunus Bas 93 (0.0%) + Julien Masson 92 (0.0%) + Aniket Limaye 91 (0.0%) + Neha Malcom Francis 85 (0.0%) + Ibai Erkiaga 82 (0.0%) + Gokul Praveen 81 (0.0%) + Yao Zi 68 (0.0%) + Alessandro Zini 67 (0.0%) + Evgeny Bachinin 58 (0.0%) + Tony Dinh 57 (0.0%) + Judith Mendez 54 (0.0%) + Vaishnav Achath 52 (0.0%) + Reid Tonking 52 (0.0%) + Rasmus Villemoes 50 (0.0%) + Yuri Zaporozhets 49 (0.0%) + John Crispin 48 (0.0%) + Tim Harvey 45 (0.0%) + Cristian Ciocaltea 41 (0.0%) + Fabio Estevam 38 (0.0%) + Huan Zhou 38 (0.0%) + Andrew Goodbody 37 (0.0%) + Aashvij Shenai 35 (0.0%) + Yu-Chien Peter Lin 32 (0.0%) + Mattijs Korpershoek 31 (0.0%) + Alexander Sverdlin 28 (0.0%) + Shree Ramamoorthy 27 (0.0%) + Andrey Skvortsov 26 (0.0%) + Keerthy 23 (0.0%) + Liya Huang 22 (0.0%) + Tengfei Fan 22 (0.0%) + Padmarao Begari 20 (0.0%) + Benjamin Lemouzy 20 (0.0%) + Paul Kocialkowski 19 (0.0%) + Vincent Stehlé 19 (0.0%) + Vignesh Raghavendra 19 (0.0%) + Ye Li 18 (0.0%) + Chanho Park 18 (0.0%) + Quentin Schulz 16 (0.0%) + Peter Robinson 15 (0.0%) + Joao Marcos Costa 15 (0.0%) + Sam Day 14 (0.0%) + Diederik de Haas 12 (0.0%) + Paul Barker 11 (0.0%) + Alif Zakuan Yuslaimi 10 (0.0%) + Naman Trivedi 10 (0.0%) + Leonard Anderweit 9 (0.0%) + Anurag Dutta 9 (0.0%) + Maks Mishin 9 (0.0%) + Siddharth Vadapalli 8 (0.0%) + Marcus Folkesson 8 (0.0%) + Prasad Kummari 7 (0.0%) + Martin Stolpe 7 (0.0%) + Gao Xiang 7 (0.0%) + Fiona Klute 6 (0.0%) + Mark Tomlinson 6 (0.0%) + Hendrik Donner 6 (0.0%) + Beleswar Padhi 6 (0.0%) + Daniel Semkowicz 6 (0.0%) + Aswath Govindraju 6 (0.0%) + Heiko Stuebner 5 (0.0%) + Rufus Segar 5 (0.0%) + Sumit Garg 5 (0.0%) + Kever Yang 5 (0.0%) + Justin Klaassen 5 (0.0%) + Jonathan Stroud 5 (0.0%) + Christoph Fritz 5 (0.0%) + Théo Lebrun 5 (0.0%) + Chen-Yu Tsai 4 (0.0%) + Aaron Kling 4 (0.0%) + Norbert van Bolhuis 4 (0.0%) + Prasanth Babu Mantena 4 (0.0%) + Nathan Morrisson 3 (0.0%) + Ronald Wahl 3 (0.0%) + Olivier L'Heureux 3 (0.0%) + Christopher Obbard 2 (0.0%) + Benedikt Spranger 2 (0.0%) + Kory Maincent 2 (0.0%) + Andrea della Porta 2 (0.0%) + Greg Malysa 2 (0.0%) + Michael Ferolito 2 (0.0%) + Igor Opaniuk 2 (0.0%) + Jonathan Humphreys 2 (0.0%) + Jesse Taube 2 (0.0%) + Sean Edmond 2 (0.0%) + Hiago De Franco 2 (0.0%) + Andrew Davis 1 (0.0%) + Michael Walle 1 (0.0%) + Ben Schneider 1 (0.0%) + Julius Lehmann 1 (0.0%) + ZHANG Yuntian 1 (0.0%) + Benjamin Szőke 1 (0.0%) + Josua Mayer 1 (0.0%) + Muhammad Hazim Izzat Zamri 1 (0.0%) + Roger Quadros 1 (0.0%) + Andy Yan 1 (0.0%) + Sébastien Szymanski 1 (0.0%) + Vincent Fazio 1 (0.0%) + Neal Frager 1 (0.0%) + Yang Gang 1 (0.0%) + Aleksandar Gerasimovski 1 (0.0%) + Meng Li 1 (0.0%) + Randolph 1 (0.0%) + ==================================== ===== + + +.. table:: Developers with the most lines removed + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Heinrich Schuchardt 17182 (17.4%) + Andre Przywara 10887 (11.0%) + Johan Jonker 3926 (4.0%) + Jonas Karlman 3734 (3.8%) + Bryan Brattlof 3116 (3.1%) + Hal Feng 1798 (1.8%) + Patrick Delaunay 1396 (1.4%) + Alexey Romanov 1109 (1.1%) + Udit Kumar 984 (1.0%) + Sam Shih 560 (0.6%) + david regan 451 (0.5%) + Richard Weinberger 260 (0.3%) + E Shattow 211 (0.2%) + Patrice Chotard 179 (0.2%) + Alexander Dahl 95 (0.1%) + Yao Zi 28 (0.0%) + Aashvij Shenai 23 (0.0%) + Tony Dinh 21 (0.0%) + Diederik de Haas 11 (0.0%) + Paul Barker 7 (0.0%) + Marcus Folkesson 6 (0.0%) + Théo Lebrun 5 (0.0%) + Neha Malcom Francis 4 (0.0%) + Alif Zakuan Yuslaimi 4 (0.0%) + Kever Yang 4 (0.0%) + Christoph Fritz 2 (0.0%) + ZHANG Yuntian 1 (0.0%) + ==================================== ===== + + +.. table:: Developers with the most signoffs (total 218) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Michal Simek 30 (13.8%) + Caleb Connolly 27 (12.4%) + Mattijs Korpershoek 21 (9.6%) + Ilias Apalodimas 13 (6.0%) + Heiko Stuebner 10 (4.6%) + Sam Shih 8 (3.7%) + Minkyu Kang 7 (3.2%) + Heiko Schocher 7 (3.2%) + Raymond Mao 7 (3.2%) + Peng Fan 7 (3.2%) + Simon Glass 6 (2.8%) + Anurag Dutta 5 (2.3%) + Neil Armstrong 5 (2.3%) + Richard Weinberger 4 (1.8%) + Prasanth Babu Mantena 4 (1.8%) + Ye Li 4 (1.8%) + Jerome Forissier 4 (1.8%) + Aniket Limaye 4 (1.8%) + Peter Robinson 3 (1.4%) + Santhosh Kumar K 3 (1.4%) + Jim Liu 3 (1.4%) + Adriano Cordova 3 (1.4%) + Neha Malcom Francis 2 (0.9%) + Kever Yang 2 (0.9%) + SkyLake.Huang 2 (0.9%) + Dan Carpenter 2 (0.9%) + Judith Mendez 2 (0.9%) + Huan Zhou 2 (0.9%) + Weijie Gao 2 (0.9%) + Marek Vasut 2 (0.9%) + Heinrich Schuchardt 1 (0.5%) + Andre Przywara 1 (0.5%) + Udit Kumar 1 (0.5%) + Patrice Chotard 1 (0.5%) + Miquel Raynal 1 (0.5%) + Ion Agorria 1 (0.5%) + Kamlesh Gurudasani 1 (0.5%) + Tejas Bhumkar 1 (0.5%) + Bjorn Andersson 1 (0.5%) + Naresh Solanki 1 (0.5%) + Bo-Cun Chen 1 (0.5%) + Andrej Valek 1 (0.5%) + Vaishnav Achath 1 (0.5%) + Daniel Schultz 1 (0.5%) + Christian Marangi 1 (0.5%) + Mikhail Kshevetskiy 1 (0.5%) + Tom Rini 1 (0.5%) + ==================================== ===== + + +.. table:: Developers with the most reviews (total 588) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Kever Yang 85 (14.5%) + Simon Glass 63 (10.7%) + Ilias Apalodimas 54 (9.2%) + Heinrich Schuchardt 30 (5.1%) + Tom Rini 24 (4.1%) + Mattijs Korpershoek 23 (3.9%) + Quentin Schulz 23 (3.9%) + Leo Yu-Chi Liang 22 (3.7%) + Patrick Delaunay 18 (3.1%) + Wadim Egorov 17 (2.9%) + Jaehoon Chung 14 (2.4%) + Caleb Connolly 11 (1.9%) + Stefan Roese 11 (1.9%) + Marek Vasut 10 (1.7%) + Jerome Forissier 9 (1.5%) + Neil Armstrong 8 (1.4%) + Peter Robinson 8 (1.4%) + Weijie Gao 8 (1.4%) + Paul Barker 8 (1.4%) + Alexander Sverdlin 8 (1.4%) + Sam Protsenko 8 (1.4%) + Manorit Chawdhry 8 (1.4%) + Bryan Brattlof 7 (1.2%) + Raymond Mao 6 (1.0%) + Peng Fan 6 (1.0%) + E Shattow 5 (0.9%) + Tien Fong Chee 5 (0.9%) + Udit Kumar 4 (0.7%) + Sinan Akman 4 (0.7%) + Devarsh Thakkar 4 (0.7%) + Sumit Garg 4 (0.7%) + Fabio Estevam 4 (0.7%) + Heiko Schocher 3 (0.5%) + Neha Malcom Francis 3 (0.5%) + Andre Przywara 3 (0.5%) + Patrice Chotard 3 (0.5%) + Miquel Raynal 3 (0.5%) + Roger Quadros 3 (0.5%) + Matthias Brugger 3 (0.5%) + Jernej Skrabec 3 (0.5%) + William Zhang 3 (0.5%) + Anand Gore 3 (0.5%) + Julien Masson 3 (0.5%) + Alexander Dahl 2 (0.3%) + Dhruva Gole 2 (0.3%) + Chris Packham 2 (0.3%) + Jan Kiszka 2 (0.3%) + Yixun Lan 2 (0.3%) + John Ogness 2 (0.3%) + Yannic Moog 2 (0.3%) + Michael Trimarchi 2 (0.3%) + Michal Simek 1 (0.2%) + Anurag Dutta 1 (0.2%) + Chen-Yu Tsai 1 (0.2%) + Andrew Davis 1 (0.2%) + Michael Brown 1 (0.2%) + Tianrui Wei 1 (0.2%) + Sughosh Ganu 1 (0.2%) + Mark Kettenis 1 (0.2%) + Anand Moon 1 (0.2%) + Francesco Dolcini 1 (0.2%) + Nicolas Belin 1 (0.2%) + Konrad Dybcio 1 (0.2%) + Viacheslav Mitrofanov 1 (0.2%) + Dragan Simic 1 (0.2%) + Siddharth Vadapalli 1 (0.2%) + Tim Harvey 1 (0.2%) + Paul Kocialkowski 1 (0.2%) + Vignesh Raghavendra 1 (0.2%) + Love Kumar 1 (0.2%) + Patrick Rudolph 1 (0.2%) + ==================================== ===== + + +.. table:: Developers with the most test credits (total 76) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + E Shattow 12 (15.8%) + Anand Moon 11 (14.5%) + Weijie Gao 8 (10.5%) + Sam Protsenko 8 (10.5%) + Mattijs Korpershoek 3 (3.9%) + Caleb Connolly 3 (3.9%) + Daniel Schultz 3 (3.9%) + Marcel Ziswiler 3 (3.9%) + FUKAUMI Naoki 3 (3.9%) + Alexey Minnekhanov 2 (2.6%) + Amit Pundir 2 (2.6%) + Primoz Fiser 2 (2.6%) + Heinrich Schuchardt 1 (1.3%) + Quentin Schulz 1 (1.3%) + Wadim Egorov 1 (1.3%) + Jerome Forissier 1 (1.3%) + Neil Armstrong 1 (1.3%) + Neha Malcom Francis 1 (1.3%) + Julien Masson 1 (1.3%) + Yannic Moog 1 (1.3%) + Michal Simek 1 (1.3%) + Tony Dinh 1 (1.3%) + Christian Kohlschütter 1 (1.3%) + Yuguo Pei 1 (1.3%) + Ferass El Hafidi 1 (1.3%) + Niklas Söderlund 1 (1.3%) + Ben Schneider 1 (1.3%) + Sam Day 1 (1.3%) + ==================================== ===== + + +.. table:: Developers who gave the most tested-by credits (total 76) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Hal Feng 22 (28.9%) + Ilias Apalodimas 9 (11.8%) + Christian Marangi 7 (9.2%) + Caleb Connolly 5 (6.6%) + Neil Armstrong 4 (5.3%) + Wadim Egorov 3 (3.9%) + Jonas Karlman 3 (3.9%) + Heinrich Schuchardt 2 (2.6%) + Jerome Forissier 2 (2.6%) + Sam Day 2 (2.6%) + Marek Vasut 2 (2.6%) + Richard Weinberger 2 (2.6%) + Kongyang Liu 2 (2.6%) + Christoph Stoidner 2 (2.6%) + Daniel Schultz 1 (1.3%) + Fabio Estevam 1 (1.3%) + Santhosh Kumar K 1 (1.3%) + Huan Zhou 1 (1.3%) + Yao Zi 1 (1.3%) + Aaron Kling 1 (1.3%) + John Crispin 1 (1.3%) + Guillaume La Roque 1 (1.3%) + Maksim Kiselev 1 (1.3%) + ==================================== ===== + + +.. table:: Developers with the most report credits (total 13) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Ludwig Nussel 2 (15.4%) + Ilias Apalodimas 1 (7.7%) + E Shattow 1 (7.7%) + Christian Kohlschütter 1 (7.7%) + Ben Schneider 1 (7.7%) + Simon Glass 1 (7.7%) + Tim Harvey 1 (7.7%) + Love Kumar 1 (7.7%) + Niklas Sombert 1 (7.7%) + Björn Töpel 1 (7.7%) + Ricardo Pardini 1 (7.7%) + Liya Huang 1 (7.7%) + ==================================== ===== + + +.. table:: Developers who gave the most report credits (total 13) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Ilias Apalodimas 2 (15.4%) + Heinrich Schuchardt 2 (15.4%) + Peng Fan 2 (15.4%) + Hal Feng 1 (7.7%) + Jonas Karlman 1 (7.7%) + Jerome Forissier 1 (7.7%) + Fabio Estevam 1 (7.7%) + Michal Simek 1 (7.7%) + Tom Rini 1 (7.7%) + Raymond Mao 1 (7.7%) + ==================================== ===== + + +.. table:: Top changeset contributors by employer + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + (Unknown) 458 (36.2%) + Google LLC 222 (17.6%) + Linaro 107 (8.5%) + Texas Instruments 82 (6.5%) + Renesas Electronics 74 (5.9%) + AMD 62 (4.9%) + DENX Software Engineering 54 (4.3%) + Konsulko Group 51 (4.0%) + NXP 35 (2.8%) + Phytec 34 (2.7%) + ST Microelectronics 25 (2.0%) + Siemens 11 (0.9%) + Toradex 11 (0.9%) + ARM 9 (0.7%) + BayLibre SAS 7 (0.6%) + Bootlin 6 (0.5%) + Intel 5 (0.4%) + Broadcom 3 (0.2%) + linutronix 2 (0.2%) + Amarula Solutions 1 (0.1%) + Collabora Ltd. 1 (0.1%) + Wind River 1 (0.1%) + Rockchip 1 (0.1%) + SUSE 1 (0.1%) + Extreme Engineering Solutions 1 (0.1%) + ==================================== ===== + + +.. table:: Top lines changed by employer + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Konsulko Group 140936 (51.6%) + (Unknown) 67870 (24.9%) + NXP 13272 (4.9%) + ARM 11060 (4.1%) + Renesas Electronics 8666 (3.2%) + Linaro 7382 (2.7%) + Google LLC 6197 (2.3%) + Texas Instruments 6119 (2.2%) + AMD 2100 (0.8%) + ST Microelectronics 1947 (0.7%) + Phytec 1919 (0.7%) + DENX Software Engineering 1860 (0.7%) + Siemens 981 (0.4%) + Intel 931 (0.3%) + Broadcom 529 (0.2%) + Toradex 400 (0.1%) + BayLibre SAS 305 (0.1%) + Bootlin 297 (0.1%) + Amarula Solutions 130 (0.0%) + Collabora Ltd. 41 (0.0%) + Rockchip 5 (0.0%) + linutronix 2 (0.0%) + SUSE 2 (0.0%) + Wind River 1 (0.0%) + Extreme Engineering Solutions 1 (0.0%) + ==================================== ===== + + +.. table:: Employers with the most signoffs (total 218) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Linaro 58 (26.6%) + (Unknown) 43 (19.7%) + AMD 31 (14.2%) + Texas Instruments 23 (10.6%) + BayLibre SAS 21 (9.6%) + NXP 11 (5.0%) + DENX Software Engineering 9 (4.1%) + Samsung 7 (3.2%) + Google LLC 6 (2.8%) + Rockchip 2 (0.9%) + Konsulko Group 1 (0.5%) + ARM 1 (0.5%) + ST Microelectronics 1 (0.5%) + Phytec 1 (0.5%) + Siemens 1 (0.5%) + Bootlin 1 (0.5%) + Canonical 1 (0.5%) + ==================================== ===== + + +.. table:: Employers with the most hackers (total 177) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + (Unknown) 94 (53.1%) + Texas Instruments 24 (13.6%) + AMD 9 (5.1%) + Linaro 8 (4.5%) + Phytec 6 (3.4%) + Bootlin 4 (2.3%) + NXP 3 (1.7%) + DENX Software Engineering 3 (1.7%) + Siemens 3 (1.7%) + Toradex 3 (1.7%) + BayLibre SAS 2 (1.1%) + ARM 2 (1.1%) + ST Microelectronics 2 (1.1%) + Renesas Electronics 2 (1.1%) + Intel 2 (1.1%) + Google LLC 1 (0.6%) + Rockchip 1 (0.6%) + Konsulko Group 1 (0.6%) + Broadcom 1 (0.6%) + Amarula Solutions 1 (0.6%) + Collabora Ltd. 1 (0.6%) + linutronix 1 (0.6%) + SUSE 1 (0.6%) + Wind River 1 (0.6%) + Extreme Engineering Solutions 1 (0.6%) + ==================================== ===== diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst index 5d41fe37a7a..01e7eff300b 100644 --- a/doc/usage/cmd/bootflow.rst +++ b/doc/usage/cmd/bootflow.rst @@ -18,7 +18,7 @@ Synopsis bootflow read bootflow boot bootflow cmdline [set|get|clear|delete|auto] <param> [<value>] - bootfloe menu [-t] + bootflow menu [-t] Description ----------- diff --git a/doc/usage/fdt_overlays.rst b/doc/usage/fdt_overlays.rst index 81d0d37f3f1..15ebd17ccb1 100644 --- a/doc/usage/fdt_overlays.rst +++ b/doc/usage/fdt_overlays.rst @@ -76,8 +76,8 @@ There are two ways to apply overlays in U-Boot. * Manually load and apply overlays The remainder of this document will discuss using overlays via the manual -approach. For information on using overlays as part of a FIT image please see: -doc/uImage.FIT/overlay-fdt-boot.txt +approach. For information on using overlays as part of a FIT image please see +:ref:`fit_configuration_using_overlays`. Manually Loading and Applying Overlays -------------------------------------- diff --git a/doc/usage/fit/overlay-fdt-boot.rst b/doc/usage/fit/overlay-fdt-boot.rst index a7db1a37f7a..3d7296ad913 100644 --- a/doc/usage/fit/overlay-fdt-boot.rst +++ b/doc/usage/fit/overlay-fdt-boot.rst @@ -111,6 +111,8 @@ Where config is one of:: This selects the DTB to use when booting. +.. _fit_configuration_using_overlays: + Configuration using overlays ---------------------------- diff --git a/drivers/clk/sophgo/clk-common.h b/drivers/clk/sophgo/clk-common.h index 95b82e968d0..a9e83d0d689 100644 --- a/drivers/clk/sophgo/clk-common.h +++ b/drivers/clk/sophgo/clk-common.h @@ -45,12 +45,14 @@ static inline u32 cv1800b_clk_getbit(void *base, struct cv1800b_clk_regbit *bit) static inline u32 cv1800b_clk_setbit(void *base, struct cv1800b_clk_regbit *bit) { - return setbits_le32(base + bit->offset, BIT(bit->shift)); + setbits_le32(base + bit->offset, BIT(bit->shift)); + return 0; } static inline u32 cv1800b_clk_clrbit(void *base, struct cv1800b_clk_regbit *bit) { - return clrbits_le32(base + bit->offset, BIT(bit->shift)); + clrbits_le32(base + bit->offset, BIT(bit->shift)); + return 0; } static inline u32 cv1800b_clk_getfield(void *base, diff --git a/drivers/misc/qfw_acpi.c b/drivers/misc/qfw_acpi.c index ec00ba65ade..c6c052ac6c3 100644 --- a/drivers/misc/qfw_acpi.c +++ b/drivers/misc/qfw_acpi.c @@ -327,7 +327,7 @@ static int evt_write_acpi_tables(void) /* Generate ACPI tables */ end = write_acpi_tables(addr); gd->arch.table_start = addr; - gd->arch.table_end = addr; + gd->arch.table_end = end; return 0; } diff --git a/include/net-common.h b/include/net-common.h index 1d507b13b06..30860f5975a 100644 --- a/include/net-common.h +++ b/include/net-common.h @@ -519,7 +519,6 @@ int wget_do_request(ulong dst_addr, char *uri); * Return: true if uri is valid, false if uri is invalid */ bool wget_validate_uri(char *uri); -//int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); /** * enum wget_http_method - http method diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index c8d9a6037f7..f220daa048f 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -15,6 +15,7 @@ #include <irq_func.h> #include <log.h> #include <malloc.h> +#include <net-common.h> #include <pe.h> #include <time.h> #include <u-boot/crc.h> @@ -2231,6 +2232,8 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, if (!efi_st_keep_devices) { bootm_disable_interrupts(); + if (IS_ENABLED(CONFIG_DM_ETH)) + eth_halt(); board_quiesce_devices(); dm_remove_devices_active(); } diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index f6889cb7399..452ec1b2e8b 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -181,10 +181,13 @@ static char *dp_msging(char *s, struct efi_device_path *dp) switch (idp->protocol) { case IPPROTO_TCP: s += sprintf(s, "TCP,"); + break; case IPPROTO_UDP: s += sprintf(s, "UDP,"); + break; default: s += sprintf(s, "0x%x,", idp->protocol); + break; } s += sprintf(s, idp->static_ip_address ? "Static" : "DHCP"); s += sprintf(s, ",%pI4", &idp->local_ip_address); diff --git a/lib/mbedtls/pkcs7_parser.c b/lib/mbedtls/pkcs7_parser.c index ecfcc46edfa..bf8ee17b5b8 100644 --- a/lib/mbedtls/pkcs7_parser.c +++ b/lib/mbedtls/pkcs7_parser.c @@ -189,10 +189,6 @@ static int authattrs_parse(struct pkcs7_message *msg, void *aa, size_t aa_len, len)) { if (__test_and_set_bit(sinfo_has_smime_caps, &sinfo->aa_set)) return -EINVAL; - - if (msg->data_type != OID_msIndirectData && - msg->data_type != OID_data) - return -EINVAL; } else if (!MBEDTLS_OID_CMP_RAW(MBEDTLS_OID_MICROSOFT_SPOPUSINFO, inner_p, len)) { if (__test_and_set_bit(sinfo_has_ms_opus_info, &sinfo->aa_set)) diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c index c00a7fe97cd..6b7b696dbf0 100644 --- a/net/lwip/net-lwip.c +++ b/net/lwip/net-lwip.c @@ -57,7 +57,7 @@ static err_t net_lwip_tx(struct netif *netif, struct pbuf *p) err = eth_get_ops(udev)->send(udev, pp ? pp : p->payload, p->len); free(pp); if (err) { - log_err("send error %d\n", err); + debug("send error %d\n", err); return ERR_ABRT; } diff --git a/net/lwip/ping.c b/net/lwip/ping.c index 200a702bbb5..c586a96806d 100644 --- a/net/lwip/ping.c +++ b/net/lwip/ping.c @@ -121,7 +121,7 @@ static int ping_loop(struct udevice *udev, const ip_addr_t *addr) netif = net_lwip_new_netif(udev); if (!netif) - return CMD_RET_FAILURE; + return -ENODEV; printf("Using %s device\n", udev->name); |