January 2023 - U-Boot

[PATCH] arm64: zynqmp: Remove xilinx_zynqmp_mini_emmc/qspi.h configs
by Michal Simek 24 Jan '23

24 Jan '23

The commit eaf6ea6a1dc1 ("Migrate CUSTOM_SYS_INIT_SP_ADDR to Kconfig using system-constants.h") moved custom init stack pointer address to Kconfig which ends up in situation that xilinx_zynqmp_mini_emmc/qspi.h are not needed anymore. That's why remove files and move defconfigs directly to xilinx_zynqmp_mini.h configuration. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- configs/xilinx_zynqmp_mini_defconfig | 2 +- configs/xilinx_zynqmp_mini_emmc0_defconfig | 2 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 2 +- configs/xilinx_zynqmp_mini_qspi_defconfig | 2 +- include/configs/xilinx_zynqmp_mini_emmc.h | 15 --------------- include/configs/xilinx_zynqmp_mini_qspi.h | 15 --------------- 6 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 include/configs/xilinx_zynqmp_mini_emmc.h delete mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index d8b3aab94f1f..9680d9b1c2f0 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y CONFIG_TEXT_BASE=0xFFFC0000 diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index a1ee98dfc252..93aaa9304b32 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y CONFIG_TEXT_BASE=0x10000 diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 88c95d4ce2a0..81ea67acedbe 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y CONFIG_TEXT_BASE=0x10000 diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 7ef62dbcdab6..046cbcf30b60 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y CONFIG_TEXT_BASE=0xFFFC0000 diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h deleted file mode 100644 index f423ddd08ec5..000000000000 --- a/include/configs/xilinx_zynqmp_mini_emmc.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP eMMC Flash utility - * - * (C) Copyright 2018 Xilinx, Inc. - * Michal Simek <michal.simek(a)xilinx.com> - * Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> - */ - -#ifndef __CONFIG_ZYNQMP_MINI_EMMC_H -#define __CONFIG_ZYNQMP_MINI_EMMC_H - -#include <configs/xilinx_zynqmp_mini.h> - -#endif /* __CONFIG_ZYNQMP_MINI_EMMC_H */ diff --git a/include/configs/xilinx_zynqmp_mini_qspi.h b/include/configs/xilinx_zynqmp_mini_qspi.h deleted file mode 100644 index 5bea1c9908c7..000000000000 --- a/include/configs/xilinx_zynqmp_mini_qspi.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP QSPI Flash utility - * - * (C) Copyright 2018 Xilinx, Inc. - * Michal Simek <michal.simek(a)xilinx.com> - * Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> - */ - -#ifndef __CONFIG_ZYNQMP_MINI_QSPI_H -#define __CONFIG_ZYNQMP_MINI_QSPI_H - -#include <configs/xilinx_zynqmp_mini.h> - -#endif /* __CONFIG_ZYNQMP_MINI_QSPI_H */ -- 2.36.1

1 1

[PATCH] soc: zynqmp: Fix IDcode for xck24
by Michal Simek 24 Jan '23

24 Jan '23

ID code was added by commit ddf8deabc39d ("arm64: zynqmp: Add support for SVD devices") based on documentation but after receiving part new ID code came up. That's why fix IDcode to match xck24 module. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- drivers/soc/soc_xilinx_zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/soc_xilinx_zynqmp.c b/drivers/soc/soc_xilinx_zynqmp.c index a51bcdb478fb..afa277f6049f 100644 --- a/drivers/soc/soc_xilinx_zynqmp.c +++ b/drivers/soc/soc_xilinx_zynqmp.c @@ -186,7 +186,7 @@ static const struct zynqmp_device zynqmp_devices[] = { .variants = ZYNQMP_VARIANT_DR, }, { - .id = 0x04714093, + .id = 0x04712093, .device = 24, .variants = 0, }, -- 2.36.1

1 1

[PATCH v3] mtd: parsers: ofpart: add workaround for #size-cells 0
by Francesco Dolcini 24 Jan '23

24 Jan '23

From: Francesco Dolcini <francesco.dolcini(a)toradex.com> Add a mechanism to handle the case in which partitions are present as direct child of the nand controller node and #size-cells is set to <0>. This could happen if the nand-controller node in the DTS is supposed to have #size-cells set to 0, but for some historical reason/bug it was set to 1 in the past, and the firmware (e.g. U-Boot) is adding the partition as direct children of the nand-controller defaulting to #size-cells being to 1. This prevents a real boot failure on colibri-imx7 that happened during v6.1 development cycles. Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ Link: https://lore.kernel.org/all/20221202071900.1143950-1-francesco@dolcini.it/ Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- I do not expect this patch to be backported to stable, however I would expect that we do not backport nand-controller dts cleanups neither. v3: minor formatting change, removed not needed new-line and space. v2: fixup size-cells only when partitions are direct children of the nand-controller completely revised commit message, comments and warning print use pr_warn instead of pr_warn_once added Reviewed-by Greg removed cc:stable@ and fixes tag, since the problematic commit was reverted --- drivers/mtd/parsers/ofpart_core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/mtd/parsers/ofpart_core.c b/drivers/mtd/parsers/ofpart_core.c index 192190c42fc8..5077000a00e6 100644 --- a/drivers/mtd/parsers/ofpart_core.c +++ b/drivers/mtd/parsers/ofpart_core.c @@ -122,6 +122,25 @@ static int parse_fixed_partitions(struct mtd_info *master, a_cells = of_n_addr_cells(pp); s_cells = of_n_size_cells(pp); + if (!dedicated && s_cells == 0) { + /* + * This is a hugly workaround to not create + * regression on devices that are still creating + * partitions as direct child of the nand controller. + * This can happen in case the nand controller node has + * #size-cells equal to 0 and the firmware (e.g. + * U-Boot) just add the partitions there assuming + * 32-bit addressing. + * + * If you get this warning your firmware and/or DTS + * should be really fixed. + * + * This is working only for devices smaller than 4GiB. + */ + pr_warn("%s: ofpart partition %pOF (%pOF) #size-cells is wrongly set to <0>, assuming <1> for parsing partitions.\n", + master->name, pp, mtd_node); + s_cells = 1; + } if (len / 4 != a_cells + s_cells) { pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n", master->name, pp, -- 2.25.1

1 1

[PATCH 1/1] efi_loader: fix comment in ESRT code
by Heinrich Schuchardt 24 Jan '23

24 Jan '23

There is no variable num_pages in function efi_esrt_allocate_install(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_esrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_esrt.c b/lib/efi_loader/efi_esrt.c index dcc08a6d3a..7f46d651e6 100644 --- a/lib/efi_loader/efi_esrt.c +++ b/lib/efi_loader/efi_esrt.c @@ -115,7 +115,7 @@ efi_status_t efi_esrt_allocate_install(u32 num_entries) u32 size = efi_esrt_entries_to_size(num_entries); efi_guid_t esrt_guid = efi_esrt_guid; - /* Reserve num_pages for ESRT */ + /* Reserve memory for ESRT */ ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, size, (void **)&new_esrt); -- 2.38.1

2 1

[PATCH] doc: add rst references to distro documentation in stm32mp1 board
by Patrick Delaunay 24 Jan '23

24 Jan '23

Use internal rst reference with :doc: to have a link to distro.rst page in the generated U-Boot documentation. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- doc/board/st/stm32mp1.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/board/st/stm32mp1.rst b/doc/board/st/stm32mp1.rst index 3f70634d2836..c0b1daa0418e 100644 --- a/doc/board/st/stm32mp1.rst +++ b/doc/board/st/stm32mp1.rst @@ -478,7 +478,8 @@ or: +-------+--------+---------+------------------------+------------------------+ And the 4th partition (Rootfs) is marked bootable with a file extlinux.conf -following the Generic Distribution feature (doc/develop/distro.rst for use). +following the Generic Distribution feature (see :doc:`../../develop/distro` for +use). The size of fip or ssbl partition must be enough for the associated binary file, 4MB and 2MB are default values. -- 2.25.1

2 1

[PATCH 00/21] Migration to using binman to generate bootloader
by Neha Malcom Francis 24 Jan '23

24 Jan '23

This series aims to eliminate the use of additional custom repositories such as k3-image-gen (K3 Image Generation) repo that was plumbed into the U-Boot build flow to generate boot images for TI K3 platform devices. And instead, we move towards using binman that aligns better with the community standard build flow. This series uses binman for all K3 platforms supported on U-Boot currently; both HS (High Security) and GP (General Purpose) devices. Background on using k3-image-gen: * TI K3 devices require a SYSFW (System Firmware) image consisting of a signed system firmware image and board configuration binaries, this is needed to bring up system firmware during U-Boot R5 SPL startup. * Board configuration data contain board-specific information such as resource management, power management and security. Series intends to use binman to take over the packaging and signing for the R5 bootloader images tiboot3.bin (and sysfw.itb, for non-combined boot flow) instead of k3-image-gen. Series also packages the A72/A53 bootloader images (tispl.bin and u-boot.img) using ATF, OPTEE and DM (Device Manager) Neha Malcom Francis (21): ti: tools: config: Add board config class to generate config binaries tools: sysfw: Add script for generating configuration blobs tools: binman: add ti-secure entry type ti: sysfw: tiboot3: Add support for packaging sysfw.itb and tiboot3.bin j721e: schema: yaml: Add general schema and J721E board config files j721e: dts: binman: Package tiboot3.bin, sysfw.itb, tispl.bin, u-boot.img j7200: yaml: Add J7200 board config files j7200: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img am65x: yaml: Add AM65x board config files am65: dts: binman: Package tiboot3.bin, sysfw.itb, tispl.bin, u-boot.img config: am64x: Add board config for AM64x am64x: dts: binman: Package tiboot3.bin, tispl.bin u-boot.img Makefile: Add DM, SYSFW_PATH, SYSFW_HS_INNER_CERT_PATH to BINMAN_INDIRS j721s2: yaml: Add board config for J721S2 j721s2: dts: binman: Package tiboot3.bin, tispl.bin and u-boot.img am62: yaml: Add board config for AM62 am625: dts: binman: Package tiboot3.bin, tispl.bin and u-boot.img am62a: yaml: Add board config for AM62ax am62a: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img k3: tools: config.mk: Update makefile and remove scripts doc: board: ti: Update documentation for binman flow Makefile | 17 + arch/arm/dts/k3-am625-r5-sk.dts | 1 + arch/arm/dts/k3-am625-sk-binman.dtsi | 377 ++ arch/arm/dts/k3-am625-sk-u-boot.dtsi | 2 + arch/arm/dts/k3-am62a-sk-binman.dtsi | 377 ++ arch/arm/dts/k3-am62a7-r5-sk.dts | 1 + arch/arm/dts/k3-am62a7-sk.dts | 1 + arch/arm/dts/k3-am642-evm-u-boot.dtsi | 2 + arch/arm/dts/k3-am642-r5-evm.dts | 1 + arch/arm/dts/k3-am64x-binman.dtsi | 440 +++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 1 + .../dts/k3-am654-r5-base-board-u-boot.dtsi | 1 + arch/arm/dts/k3-am65x-binman.dtsi | 482 +++ arch/arm/dts/k3-j7200-binman.dtsi | 377 ++ .../k3-j7200-common-proc-board-u-boot.dtsi | 2 + arch/arm/dts/k3-j721e-binman.dtsi | 605 +++ .../k3-j721e-common-proc-board-u-boot.dtsi | 1 + .../arm/dts/k3-j721e-r5-common-proc-board.dts | 1 + arch/arm/dts/k3-j721s2-binman.dtsi | 377 ++ .../k3-j721s2-common-proc-board-u-boot.dtsi | 2 + .../dts/k3-j721s2-r5-common-proc-board.dts | 1 + arch/arm/mach-k3/config.mk | 102 +- board/ti/am62ax/Kconfig | 2 + board/ti/am62ax/config.yaml | 1553 ++++++++ board/ti/am62x/Kconfig | 2 + board/ti/am62x/config.yaml | 1490 ++++++++ board/ti/am64x/Kconfig | 2 + board/ti/am64x/config.yaml | 1805 +++++++++ board/ti/am65x/Kconfig | 2 + board/ti/am65x/config.yaml | 2469 ++++++++++++ board/ti/common/schema.yaml | 355 ++ board/ti/j721e/Kconfig | 4 + board/ti/j721e/config.yaml | 3162 ++++++++++++++++ board/ti/j721e/config_j7200.yaml | 2467 ++++++++++++ board/ti/j721s2/Kconfig | 2 + board/ti/j721s2/config.yaml | 3303 +++++++++++++++++ doc/board/ti/am62x_sk.rst | 22 +- doc/board/ti/j721e_evm.rst | 35 +- doc/board/ti/k3.rst | 50 +- include/binman_sym.h | 2 + scripts/Makefile.spl | 2 + test/py/requirements.txt | 1 + tools/binman/entries.rst | 15 + tools/binman/etype/ti_secure.py | 133 + tools/binman/ftest.py | 8 + tools/k3_fit_atf.sh | 123 - tools/k3_gen_x509_cert.sh | 262 -- tools/k3_sysfw_boardcfg_blob_creator.py | 116 + tools/tibcfg_gen.py | 117 + 49 files changed, 20146 insertions(+), 529 deletions(-) create mode 100644 arch/arm/dts/k3-am625-sk-binman.dtsi create mode 100644 arch/arm/dts/k3-am62a-sk-binman.dtsi create mode 100644 arch/arm/dts/k3-am64x-binman.dtsi create mode 100644 arch/arm/dts/k3-am65x-binman.dtsi create mode 100644 arch/arm/dts/k3-j7200-binman.dtsi create mode 100644 arch/arm/dts/k3-j721e-binman.dtsi create mode 100644 arch/arm/dts/k3-j721s2-binman.dtsi create mode 100644 board/ti/am62ax/config.yaml create mode 100644 board/ti/am62x/config.yaml create mode 100644 board/ti/am64x/config.yaml create mode 100644 board/ti/am65x/config.yaml create mode 100644 board/ti/common/schema.yaml create mode 100644 board/ti/j721e/config.yaml create mode 100644 board/ti/j721e/config_j7200.yaml create mode 100644 board/ti/j721s2/config.yaml create mode 100644 tools/binman/etype/ti_secure.py delete mode 100755 tools/k3_fit_atf.sh delete mode 100755 tools/k3_gen_x509_cert.sh create mode 100755 tools/k3_sysfw_boardcfg_blob_creator.py create mode 100644 tools/tibcfg_gen.py -- 2.34.1

2 30

[PATCH 0/2] ARM: arch-meson: add support for Odroid Go Ultra
by Neil Armstrong 24 Jan '23

24 Jan '23

This adds initial support for the Hardkernel Odroid Go Ultra. The Odroid Go Ultra is a portable gaming device with the following characteristics: - Amlogic S922X SoC - RK817 & RK818 PMICs - 2GiB LPDDR4 - On board 16GiB eMMC - Micro SD Card slot - 5inch 854×480 MIPI-DSI TFT LCD - Earphone stereo jack, 0.5Watt 8Ω Mono speaker - Li-Polymer 3.7V/4000mAh Battery - USB-A 2.0 Host Connector - x16 GPIO Input Buttons - 2x ADC Analog Joysticks - USB-C Port for USB2 Device and Charging The following are not yet handled: - Battery RK818 Gauge and Charging - 5inch 854×480 MIPI-DSI TFT LCD - Power Halt Cc: u-boot(a)lists.denx.de Cc: u-boot-amlogic(a)groups.io Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (2): ARM: dts: sync Amlogic ARM64 DT from v6.2-rc1 ARM: meson: add support for Odroid Go Ultra arch/arm/dts/Makefile | 1 + arch/arm/dts/meson-g12-common.dtsi | 167 +++-- arch/arm/dts/meson-g12a.dtsi | 5 + .../arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi | 16 + arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 722 +++++++++++++++++++++ arch/arm/dts/meson-g12b.dtsi | 5 + arch/arm/dts/meson-sm1.dtsi | 52 +- configs/odroid-go-ultra_defconfig | 70 ++ doc/board/amlogic/index.rst | 4 +- doc/board/amlogic/odroid-go-ultra.rst | 34 + 10 files changed, 999 insertions(+), 77 deletions(-) --- base-commit: 62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9 change-id: 20230119-u-boot-odroid-go-ultra-9d3c7ae3c910 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

1 3

[PATCH v1 0/2] CMD commands improvements
by Svyatoslav Ryhel 24 Jan '23

24 Jan '23

- add new command 'continue' which stops performing script until any key is pressed by user. It is useful for keeping logs in output device until user allows to continue script run. - add ability for 'ums' command to interrupt run of usb mass storage with any key. This is especially useful on devices with limited input capabilities like tablets and smatphones which have only gpio keys in direct access. Current implementation uses Kconfig entry. Svyatoslav Ryhel (2): cmd: exit: add continue on key press command cmd: ums: abort mounting by pressing any key cmd/Kconfig | 6 ++++++ cmd/exit.c | 17 +++++++++++++++++ cmd/usb_mass_storage.c | 9 +++++++++ 3 files changed, 32 insertions(+) -- 2.25.1

3 6

Re: [PATCH 72/88] sh4: Drop unused kona_i2c driver
by Heiko Schocher 24 Jan '23

24 Jan '23

Hello Simon, On 23.01.23 23:00, Simon Glass wrote: > This is not used. Drop the driver and Kconfig option. > > Signed-off-by: Simon Glass <sjg(a)chromium.org> > --- > > drivers/i2c/Makefile | 1 - > drivers/i2c/kona_i2c.c | 728 ----------------------------------------- > 2 files changed, 729 deletions(-) > delete mode 100644 drivers/i2c/kona_i2c.c Thanks! Reviewed-by: Heiko Schocher <hs(a)denx.de> bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

1 0

[PATCH v4 0/4] eficonfig: add vertical scroll support and refactoring
by Masahisa Kojima 24 Jan '23

24 Jan '23

This series aims to add the vertical scroll for the eficonfig menu. Before adding scroll support, this series does the refactoring of change boot order implementation since it has own menu handling and it should be removed to improve maintainability. The eficonfig menu handles file selection for EFI load option and secure boot keys, it likely to enumerate tens of files. User can not select the file without scroll if theare are many files under the target directory. This series only modifies the eficonfig menus. Other menus such as bootmenu is not yet done. We need to enhance the U-Boot menu framework itself if we support other menus. [Major update] - rebased to U-Boot master as of 20th Jan. 2023 Masahisa Kojima (4): eficonfig: refactor eficonfig_process_common function eficonfig: refactor change boot order implementation eficonfig: add vertical scroll support eficonfig: increase the number of menu entries cmd/eficonfig.c | 386 +++++++++++++++++++++++++++++------------- cmd/eficonfig_sbkey.c | 18 +- include/efi_config.h | 19 ++- include/efi_loader.h | 1 + 4 files changed, 299 insertions(+), 125 deletions(-) -- 2.17.1

2 9