March 2023 - U-Boot

[PATCH 1/2] Revert "buildman: Correct CROSS_COMPILE output for sandbox"
by Simon Glass 13 Mar '23

13 Mar '23

This reverts commit bd0a548ad4a155fec29473d4cc8e135832926973. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/buildman/toolchain.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 8f9130bdcdf..688f2e26872 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -156,8 +156,9 @@ class Toolchain: Returns: Value of that environment variable or arguments """ + wrapper = self.GetWrapper() if which == VAR_CROSS_COMPILE: - return self.GetWrapper() + self.cross + return wrapper + os.path.join(self.path, self.cross) elif which == VAR_PATH: return self.path elif which == VAR_ARCH: -- 2.40.0.rc1.284.g88254d51c5-goog

1 3

[RESEND PATCH] kconfig: Proposed language extension for multiple builds
by Simon Glass 12 Mar '23

12 Mar '23

(I am sending this again to get more feedback) In the case of Linux, only one build is produced so there is only a single configuration. For other projects, such as U-Boot and Zephyr, the same code is used to produce multiple builds, each with related (but different) options enabled. This can be handled with the existing kconfig language, but it is quite verbose, somewhat tedious and very error-prone, since there is a lot of duplication. The result is hard to maintain. Describe an extension to the Kconfig language to support easier handling of this use case. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Documentation/kbuild/kconfig-language.rst | 134 ++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/Documentation/kbuild/kconfig-language.rst b/Documentation/kbuild/kconfig-language.rst index 858ed5d80defe..73fb016a5533f 100644 --- a/Documentation/kbuild/kconfig-language.rst +++ b/Documentation/kbuild/kconfig-language.rst @@ -228,6 +228,24 @@ applicable everywhere (see syntax). enables the third modular state for all config symbols. At most one symbol may have the "modules" option set. +- phase declaration: "defphase" + This defines a new build phase. See `Build Phases`_. + +- default phase: "phasedefault" + This indicates the default build phase. See `Build Phases`_. + +- add entries for phases: "addphases" + This creates new phase-specific entries based on a template entry and adds + the same attributes to it. See `Build Phases`_. + +- set entries for phases: "setphases" + This sets the phases which need an entry. This allows creating an entry that + only has a primary phase. See `Build Phases`_. + +- indicate a phase-specific attribute: "forphases" + This marks an attribute as being applicable only to a particular phase or + group of phases. See `Build Phases`_. + Menu dependencies ----------------- @@ -319,6 +337,119 @@ MODVERSIONS directly depends on MODULES, this means it's only visible if MODULES is different from 'n'. The comment on the other hand is only visible when MODULES is set to 'n'. +Build Phases +------------ + +Some projects use Kconfig to control multiple build phases, each phase +resulting in a separate set of object files and executable. This is the +case in U-Boot [12]_. Zephyr OS seems to be heading this way too [13]_. + +Generally the phases are related, so that enabling an entry in the primary +phase also enables it by default in the others. But in some cases it may +be desirable to use separate conditions for each phase. + +All phases have a phase name, for example `SPL`. This name is used as a +prefix to each entry used in that phase, with an underscore in between. +So if FOO is the primary entry, the equivalent entry for the SPL phase +is SPL_FOO. The primary phase is marked with a "phasedefault" entry. + +Phases are declared like any other menu entry except that also have a +"defphase" keyword. Phase entries are normally hidden so do not have a +prompt:: + + config PPL + bool + defphase "Primary Program Loader" + phasedefault + help + This is the primary bootloader. + + config SPL + bool + defphase "Secondary Program Loader" + help + This is used to set up memory and load the primary bootloader. + +The default phase (here PPL) is assumed for all entries, in the sense that +all entries are present in PPL by default and no prefix is needed on these +entries. So FOO means that it applies to PPL. There must be exactly one +default phase. + +The resulting menu entries can be used normally throughout the Kconfig. With +this technique, the different build phases can be fully and individually +controlled from Kconfig. + +However it is not ideal. Often the secondary phases have far fewer entries than +the primary phase, since they offer fewer features. Even so, each FOO that is +needed in a phase must have an SPL_FOO, etc. To avoid an explosion of entries, +it is possible to indicate which are enabled, as a shortcut for creating new +entries:: + + config FOO + bool "Enable foo feature" + addphases SPL + depends on %BAR + depends on QUX + forphases SPL depends on FIZZ + +Note that "%" expands to the phase, so this is equivalent to (ignoring BAR):: + + config FOO + bool "Enable foo feature" + depends on BAR + depends on QUX + + config SPL_FOO # Phase is prepended + bool "Enable foo feature (SPL)" # Suffix is added + depends on SPL_BAR # "%" dependency is expanded + depends on QUX + depends on FIZZ # Added only for SPL + depends on SPL # Added automatically + +Attributes declared in the primary symbol FOO (such as "depends on BAR") also +apply to the secondary ones. + +An entry without any 'addphases' attribute applies to all phases. Individual +phase entries are not available in that case. If the entry is enabled, then +it is enabled for all phases. Only one entry appears in the resulting Kconfig. + +In the case where an entry should apply only to the primary phase (or a +particular set of phases), you can uses "setphases" instead of "addphases":: + + config FOO + bool "Enable foo feature" + setphases PPL + +This means that even if the option is enabled, it will not be active outside +the primary-phase build, here named "PPL". + +Internally, phases are implemented simply by creating new entries. These +appear in the Kconfig as per normal. It would be possible for a Kconfig +editor to show the entries just for a particular phase, leaving out the +entries not applicable to that phase. + +When phases are used, the Kconfig tool outputs separate auto.conf files for +each phase (e.g. auto_spl.conf), so that if SPL_FOO is enabled, then +`CONFIG_FOO=y` is present in the file. This makes it easy for the build system +to build the correct code, use IS_ENABLED(), etc. + +To ensure that the correct options are enabled for each build, in addition to +the normal CONFIG_FOO option in the file, phase symbols are added too. For +example, if FOO is enabled in the SPL phase, then auto_spl.conf contains:: + + CONFIG_FOO=y + CONFIG_SPL_FOO=y + +The phase-specific line (CONFIG_SPL_FOO) is seldom needed, but it allows one +phase to access the symbols from another phase. For example, if the primary +phase needs to receive boot timings from SPL, then support for boot timings must +be added in both phases. If the timings are at a fixed address, this can be in a +shared symbol (like CONFIG_SPL_TIMING_BASE) that both phases can access. + +Technical note: the grammar definition of <symbol> in this documeent does not +include the "%" prefix at present. It can be used with any attribute. It cannot +be used with any top-level items, like "config", "menuconfig", "if" and "menu". + Kconfig syntax -------------- @@ -744,3 +875,6 @@ https://kernelnewbies.org/KernelProjects/kconfig-sat .. [9] https://www4.cs.fau.de/Publications/2011/tartler_11_eurosys.pdf .. [10] https://paulgazzillo.com/papers/esecfse21.pdf .. [11] https://github.com/paulgazz/kmax + +.. [12] https://u-boot.readthedocs.io/en/latest/develop/spl.html +.. [13] https://docs.zephyrproject.org/latest/build/sysbuild/index.html -- 2.40.0.rc1.284.g88254d51c5-goog

5 4

[RFC/PATCH] lib/Kconfig: Enable OF_LIBFDT_OVERLAY by default when FIT is enabled
by Laurent Pinchart 12 Mar '23

12 Mar '23

FIT image support is commonly used to bundle a kernel image, a device tree, and device tree overlays. Applying overlays requires the OF_LIBFDT_OVERLAY config option to be set, which lots of boards fail to select, most likely because developers never noticed. This leads to an error when trying to apply overlays: "config with overlays but CONFIG_OF_LIBFDT_OVERLAY not set" TI ARM boards select the option by default. Extend this to all systems that select the FIT option. This only affects the default, overlay support can still be disabled manually in the configuration. Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> --- I'm posting this as an RFC to get feedback. If the idea is generally appreciated, I'll update the defconfig files accordingly. --- lib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 549bd3577851..d309ccf83c03 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -823,7 +823,7 @@ config OF_LIBFDT_ASSUME_MASK config OF_LIBFDT_OVERLAY bool "Enable the FDT library overlay support" depends on OF_LIBFDT - default y if ARCH_OMAP2PLUS || ARCH_KEYSTONE + default y if FIT help This enables the FDT library (libfdt) overlay support. base-commit: f147aa80f52989c7455022ca1ab959e8545feccc -- Regards, Laurent Pinchart

4 4

[PATCH v6 00/22] Fixes for Rockchip NFC driver part 1
by Johan Jonker 11 Mar '23

11 Mar '23

This serie contains fixes for the Rockchip NFC driver, which was ported to U-boot and merged with little review and testing it seems. Part 1 aims at passing the probe function without errors. Extended with tree wide function cleanup needed for 64bit DT parsing. Fixed are: 64bit FDT parsing compatible string removal add missing layout structure add missing flash_node pointer add missing chip ID Changed V6: use -EINVAL on return drop cast use map_sysmem() function as cast add and rename patch Changed V5: sort patch order add more fixes with pointer functions add debug text fixes test with binman for ARM only due to limited resources Changed V4: fix cast and divider in syscon-uclass.c Changed V3: use dev_read_addr_ptr fix oobfree TODO: Time consuming binman test for other SoC types then ARM. Help with testing appreciated. Johan Jonker (21): mtd: nand: raw: rockchip_nfc: use dev_read_addr_ptr mtd: nand: raw: rockchip_nfc: remove the compatible string "rockchip,rk3308-nfc" mtd: nand: raw: rockchip_nfc: add layout structure mtd: nand: raw: rockchip_nfc: add flash_node to chip structure mtd: nand: raw: rockchip_nfc: fix oobfree offset and description rockchip: adc: rockchip-saradc: use dev_read_addr_ptr rockchip: timer: dw-apb-timer: use reg variable with phys_addr_t size rockchip: pwm: rk_pwm: use reg variable with phys_addr_t size include: dm: ofnode: fix headers core: remap: convert regmap_init_mem_plat() input to phys_addr_t core: fdtaddr: add devfdt_get_addr_size_index_ptr function core: read: add dev_read_addr_index_ptr function spi: spi-aspeed-smc: use devfdt_get_addr_index_ptr drivers: use dev_read_addr_index_ptr when cast to pointer drivers: use dev_read_addr_ptr when cast to pointer drivers: use devfdt_get_addr_size_index_ptr when cast to pointer drivers: use devfdt_get_addr_index_ptr when cast to pointer drivers: use devfdt_get_addr_ptr when cast to pointer drivers: fix debug string with fdt_addr_t input arm: stm32mp: spl: fix function with fdt_addr_t input include: fdtdec: decouple fdt_addr_t and phys_addr_t size Paweł Jarosz (1): mtd: nand: add support for the Sandisk SDTNQGAMA chip Kconfig | 8 ++ arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/system-controller.c | 4 +- arch/arm/mach-stm32mp/spl.c | 6 +- doc/develop/driver-model/livetree.rst | 2 +- drivers/adc/rockchip-saradc.c | 6 +- drivers/ata/dwc_ahsata.c | 2 +- drivers/cache/cache-l2x0.c | 2 +- drivers/cache/cache-v5l2.c | 2 +- drivers/clk/at91/sama7g5.c | 2 +- drivers/clk/at91/sckc.c | 2 +- drivers/clk/clk-hsdk-cgu.c | 4 +- drivers/clk/ti/clk-ctrl.c | 9 ++- drivers/core/fdtaddr.c | 8 ++ drivers/core/read.c | 15 +++- drivers/core/regmap.c | 2 +- drivers/core/syscon-uclass.c | 4 +- drivers/ddr/altera/sdram_gen5.c | 4 +- drivers/gpio/mscc_sgpio.c | 2 +- drivers/gpio/tegra_gpio.c | 4 +- drivers/gpio/xilinx_gpio.c | 2 +- drivers/i2c/i2c-cdns.c | 4 +- drivers/i2c/tegra_i2c.c | 4 +- drivers/mmc/am654_sdhci.c | 2 +- drivers/mmc/davinci_mmc.c | 2 +- drivers/mmc/piton_mmc.c | 2 +- drivers/mmc/tegra_mmc.c | 2 +- drivers/mmc/xenon_sdhci.c | 2 +- drivers/mmc/zynq_sdhci.c | 6 +- drivers/mtd/nand/raw/arasan_nfc.c | 2 +- drivers/mtd/nand/raw/cortina_nand.c | 6 +- drivers/mtd/nand/raw/mxic_nand.c | 2 +- drivers/mtd/nand/raw/nand_ids.c | 3 + drivers/mtd/nand/raw/rockchip_nfc.c | 78 +++++++------------ drivers/mtd/nand/raw/tegra_nand.c | 2 +- drivers/mtd/nand/raw/zynq_nand.c | 2 +- drivers/net/dm9000x.c | 2 +- drivers/net/dwmac_meson8b.c | 4 +- drivers/net/mvmdio.c | 2 +- drivers/net/mvpp2.c | 24 +++--- drivers/net/qe/dm_qe_uec_phy.c | 2 +- drivers/pci/pci-aardvark.c | 4 +- drivers/pci/pcie_dw_meson.c | 8 +- drivers/pci/pcie_dw_mvebu.c | 10 +-- drivers/pci/pcie_dw_rockchip.c | 8 +- drivers/pci/pcie_imx.c | 4 +- drivers/pci/pcie_layerscape_ep.c | 8 +- drivers/phy/allwinner/phy-sun50i-usb3.c | 6 +- drivers/phy/marvell/comphy_core.c | 12 +-- drivers/phy/phy-stm32-usbphyc.c | 4 +- drivers/phy/qcom/phy-qcom-usb-hs-28nm.c | 4 +- drivers/phy/qcom/phy-qcom-usb-ss.c | 4 +- .../phy/rockchip/phy-rockchip-snps-pcie3.c | 4 +- drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- drivers/pwm/rk_pwm.c | 2 +- drivers/pwm/tegra_pwm.c | 2 +- drivers/ram/rockchip/sdram_rk3066.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk322x.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/serial/serial_zynq.c | 6 +- drivers/spi/cadence_qspi.c | 5 +- drivers/spi/mpc8xxx_spi.c | 2 +- drivers/spi/mscc_bb_spi.c | 2 +- drivers/spi/mtk_snor.c | 2 +- drivers/spi/mtk_spim.c | 2 +- drivers/spi/sh_qspi.c | 2 +- drivers/spi/spi-aspeed-smc.c | 17 ++-- drivers/spi/spi-mxic.c | 2 +- drivers/spi/xilinx_spi.c | 2 +- drivers/timer/dw-apb-timer.c | 2 +- drivers/ufs/ufs.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/musb-new/ti-musb.c | 2 +- drivers/video/dw_mipi_dsi.c | 4 +- drivers/video/rockchip/rk_vop.c | 2 +- drivers/video/stm32/stm32_dsi.c | 4 +- drivers/video/stm32/stm32_ltdc.c | 4 +- drivers/video/tegra124/display.c | 2 +- drivers/video/tegra124/sor.c | 6 +- drivers/video/ti/tilcdc.c | 4 +- drivers/watchdog/cdns_wdt.c | 6 +- drivers/watchdog/sbsa_gwdt.c | 12 +-- drivers/watchdog/sp805_wdt.c | 6 +- drivers/watchdog/xilinx_tb_wdt.c | 6 +- include/dm/fdtaddr.h | 17 +++- include/dm/ofnode.h | 16 ++-- include/fdtdec.h | 13 +++- include/regmap.h | 2 +- include/syscon.h | 13 ++-- 92 files changed, 269 insertions(+), 241 deletions(-) -- 2.20.1

3 34

sandbox_spl build warning
by Simon Glass 11 Mar '23

11 Mar '23

Hi Marek, I see this in CI for -next: Building current source for 1 boards (0 threads, 64 jobs per thread) sandbox: w+ sandbox_spl + 1159 | fdt_test_header_get(uts, fdt, "magic", fdt_magic(fdt)); + | ^ +test/cmd/fdt.c:1159:9: note: referencing argument 2 of type ‘char *’ +test/cmd/fdt.c:1115:12: note: in a call to function ‘fdt_test_header_get’ + 1115 | static int fdt_test_header_get(struct unit_test_state *uts, char fdt[4096], + | ^ + 1160 | fdt_test_header_get(uts, fdt, "totalsize", fdt_totalsize(fdt)); here: https://source.denx.de/u-boot/custodians/u-boot-dm/-/jobs/591918 Could you please take a look? Regards, Simon

2 1

[PATCH v2 1/2] spl: mmc: Pass eMMC HW partition and SW partition to spl_mmc_get_uboot_raw_sector()
by Marek Vasut 11 Mar '23

11 Mar '23

Pass both eMMC HW partition and software partition numbers to spl_mmc_get_uboot_raw_sector() so the function can better decide which offset within the partition to load payload from. Signed-off-by: Fedor Ross <fedor.ross(a)ifm.com> Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Peng Fan <peng.fan(a)nxp.com> --- V2: No change --- arch/arm/mach-imx/image-container.c | 2 ++ arch/arm/mach-sunxi/board.c | 2 ++ common/spl/spl_mmc.c | 15 +++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c index 06ee608c4a4..c8c263fde7e 100644 --- a/arch/arm/mach-imx/image-container.c +++ b/arch/arm/mach-imx/image-container.c @@ -215,6 +215,8 @@ unsigned long spl_spi_get_uboot_offs(struct spi_flash *flash) #ifdef CONFIG_SPL_MMC unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, + unsigned long hw_part, + unsigned long raw_part, unsigned long raw_sect) { int end; diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 391a65a5495..3be444d84fe 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -324,6 +324,8 @@ uint32_t sunxi_get_spl_size(void) * immediately follow the SPL if that is bigger than that. */ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, + unsigned long hw_part, + unsigned long raw_part, unsigned long raw_sect) { unsigned long spl_size = sunxi_get_spl_size(); diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index e4135b20487..8a0c7331267 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -370,6 +370,8 @@ int __weak spl_mmc_boot_partition(const u32 boot_device) #endif unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc, + unsigned long hw_part, + unsigned long raw_part, unsigned long raw_sect) { return raw_sect; @@ -418,7 +420,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, static struct mmc *mmc; u32 boot_mode; int err = 0; - __maybe_unused int part = 0; + __maybe_unused int hw_part = 0; int mmc_dev; /* Perform peripheral init only once for an mmc device */ @@ -442,12 +444,12 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: - part = spl_mmc_emmc_boot_partition(mmc); + hw_part = spl_mmc_emmc_boot_partition(mmc); if (CONFIG_IS_ENABLED(MMC_TINY)) - err = mmc_switch_part(mmc, part); + err = mmc_switch_part(mmc, hw_part); else - err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); + err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), hw_part); if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT @@ -465,7 +467,8 @@ int spl_mmc_load(struct spl_image_info *spl_image, return err; } - raw_sect = spl_mmc_get_uboot_raw_sector(mmc, raw_sect); + raw_sect = spl_mmc_get_uboot_raw_sector(mmc, hw_part, + raw_part, raw_sect); #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION err = mmc_load_image_raw_partition(spl_image, bootdev, @@ -476,7 +479,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, #endif #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR err = mmc_load_image_raw_sector(spl_image, bootdev, mmc, - raw_sect + spl_mmc_raw_uboot_offset(part)); + raw_sect + spl_mmc_raw_uboot_offset(hw_part)); if (!err) return err; #endif -- 2.39.2

1 1

[PATCH] x86: Revert "x86: minnowmax: Adjust CONFIG_TEXT_BASE"
by Simon Glass 11 Mar '23

11 Mar '23

This causes Minnowmax to stop booting. I am not sure why though. Drop the EFI_LOADER feature instead, since it is not needed. This reverts commit 66e2c665f3b60d726e1c26ad44ac97aa76ead6f5. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- configs/minnowmax_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 679b6e3de53..0d7f55a651f 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 @@ -74,3 +74,4 @@ CONFIG_VIDEO_COPY=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_GENERATE_ACPI_TABLE=y # CONFIG_GZIP is not set +# CONFIG_EFI_LOADER is not set -- 2.39.1.519.gcb327c4b5f-goog

2 2

[PATCH V5 00/12] IOT2050-related enhancements
by Jan Kiszka 11 Mar '23

11 Mar '23

(Almost) flushing our upstream queue for the IOT2050 device, this mostly brings board-specific changes such as: - updated build process and firmware layout for PG1 vs. PG2 devices - more watchdog preparations - preparations for verified boot on IOT2050 Advanced devices This series depends on https://lore.kernel.org/u-boot/cover.1675426972.git.jan.kiszka@siemens.com/ ("env: Enhancements for establishing variable protection") Changes in v5: - factored out two patches Changes in v4: - rebased over latest master - make use of new CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN Changes in v3: - further reworked patch 1 to load default env directly, leaving driver ordering alone Changes in v2: - rebased over latest master - reworked patch 1 to be less invasive to the code - added "iot2050: use the named gpio to control the user-button" Still in our backlog is support for a new variant that comes with M.2 slots. Related DT patches were sent to the kernel and are under review now. Jan CC: chao zeng <chao.zeng(a)siemens.com> CC: Su Baocheng <baocheng.su(a)siemens.com> Jan Kiszka (9): iot2050: Update firmware layout iot2050: Add watchdog start to bootcmd iot2050: Add CONFIG_ENV_FLAGS_LIST_STATIC arm: dts: iot2050: Allow verifying U-Boot proper by SPL tools: Add script for converting public key into device tree include iot2050: Add script for signing artifacts arm: dts: iot2050: Optionally embed OTP programming data into image doc: iot2050: Add a note about the watchdog firmware iot2050: Refresh defconfigs and activate CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN Su Baocheng (2): board: siemens: iot2050: Split the build for PG1 and PG2 arm: dts: iot2050: Use the auto generator nodes for fdt chao zeng (1): board: siemens: iot2050: use the named gpio to control the user-button arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 134 ++++++------------ board/siemens/iot2050/Kconfig | 35 ++++- board/siemens/iot2050/board.c | 17 +-- ...ot2050_defconfig => iot2050_pg1_defconfig} | 13 +- ...ot2050_defconfig => iot2050_pg2_defconfig} | 15 +- doc/board/siemens/iot2050.rst | 79 ++++++++++- include/configs/iot2050.h | 17 +++ tools/binman/missing-blob-help | 14 +- tools/iot2050-sign-fw.sh | 51 +++++++ tools/key2dtsi.py | 64 +++++++++ 10 files changed, 309 insertions(+), 130 deletions(-) copy configs/{iot2050_defconfig => iot2050_pg1_defconfig} (93%) rename configs/{iot2050_defconfig => iot2050_pg2_defconfig} (91%) create mode 100755 tools/iot2050-sign-fw.sh create mode 100755 tools/key2dtsi.py -- 2.35.3

4 38

[PATCH 00/10] efi: Improvements to booting and debugging
by Simon Glass 11 Mar '23

11 Mar '23

This series provides support for booting a kernel from the EFI app. So far this is pretty basic, since it only supports the actual booting, not providing ACPI tables, etc. But it is a start. It also includes an enhancement to the 'efi' command and a few other clean-ups. Simon Glass (10): efi: Set RUN_64BIT correctly for the EFI app x86: Adjust bootparam.h to be more like linux x86: Add return-value comment to cpu_jump_to_64bit() x86: Support booting a 64-bit kernel from 64-bit U-Boot x86: Exit EFI boot services before starting kernel x86: Support zboot and bootm in the EFI app efi: Add another tranch of GUIDs doc: Add help for the efi command efi: Support showing tables efI: Allow packaging a kernel in the debugging script arch/x86/Kconfig | 4 +- arch/x86/include/asm/bootm.h | 12 +- arch/x86/include/asm/bootparam.h | 70 ++++++---- arch/x86/include/asm/cpu.h | 1 + arch/x86/lib/bootm.c | 43 ++++-- arch/x86/lib/zimage.c | 17 ++- cmd/efi.c | 40 +++++- configs/efi-x86_app32_defconfig | 2 +- configs/efi-x86_app64_defconfig | 3 +- doc/usage/cmd/efi.rst | 219 +++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + include/efi_api.h | 28 ++++ lib/uuid.c | 12 ++ scripts/build-efi.sh | 14 +- 14 files changed, 419 insertions(+), 47 deletions(-) create mode 100644 doc/usage/cmd/efi.rst -- 2.39.2.637.g21b0678d19-goog

3 15

[PATCH v2] mtd: rawnand: nand_base: Handle algorithm selection
by Linus Walleij 11 Mar '23

11 Mar '23

For BRCMNAND with 1-bit BCH ECC (BCH-1) such as used on the D-Link DIR-885L and DIR-890L routers, we need to explicitly select the ECC like this in the device tree: nand-ecc-algo = "bch"; nand-ecc-strength = <1>; nand-ecc-step-size = <512>; This is handled by the Linux kernel but U-Boot core does not respect this. Fix it up by parsing the algorithm and preserve the behaviour using this property to select software BCH as far as possible. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v1->v2: - Drop pointless check for ecc_algo >= 0, it is always >= 0. --- drivers/mtd/nand/raw/nand_base.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9eba360d55f3..c173fd09237a 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4487,6 +4487,7 @@ EXPORT_SYMBOL(nand_detect); static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode node) { int ret, ecc_mode = -1, ecc_strength, ecc_step; + int ecc_algo = NAND_ECC_UNKNOWN; const char *str; ret = ofnode_read_s32_default(node, "nand-bus-width", -1); @@ -4512,10 +4513,13 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod ecc_mode = NAND_ECC_SOFT_BCH; } - if (ecc_mode == NAND_ECC_SOFT) { - str = ofnode_read_string(node, "nand-ecc-algo"); - if (str && !strcmp(str, "bch")) + str = ofnode_read_string(node, "nand-ecc-algo"); + if (str && !strcmp(str, "bch")) { + ecc_algo = NAND_ECC_BCH; + if (ecc_mode == NAND_ECC_SOFT) ecc_mode = NAND_ECC_SOFT_BCH; + } else if (!strcmp(str, "hamming")) { + ecc_algo = NAND_ECC_HAMMING; } ecc_strength = ofnode_read_s32_default(node, @@ -4529,6 +4533,8 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod return -EINVAL; } + chip->ecc.algo = ecc_algo; + if (ecc_mode >= 0) chip->ecc.mode = ecc_mode; -- 2.39.1

3 2