June 2022 - U-Boot

[PATCH v6 0/6] enable menu-driven boot device selection
by Masahisa Kojima 13 Jun '22

13 Jun '22

Most of the patches are merged into u-boot/master, this series contains the remaining patches to support menu-driven UEFI boot variable maintenance and removable media support. [Major Changes] - rebased to v2022.07-rc2 - there is detailed changelog in each commit Masahisa Kojima (6): efi_loader: menu-driven addition of UEFI boot option efi_loader: menu-driven deletion of UEFI boot variable efi_loader: menu-driven update of UEFI bootorder variable bootmenu: add removable media entries doc:bootmenu: add description for UEFI boot support lib/charset: fix compile warnings cmd/bootmenu.c | 167 ++- doc/usage/cmd/bootmenu.rst | 55 + include/charset.h | 2 +- include/efi_loader.h | 60 + lib/efi_loader/Makefile | 3 + lib/efi_loader/efi_bootmenu_maintenance.c | 1282 +++++++++++++++++++++ lib/efi_loader/efi_bootmgr.c | 4 + lib/efi_loader/efi_boottime.c | 52 +- lib/efi_loader/efi_console.c | 81 ++ lib/efi_loader/efi_disk.c | 11 + lib/efi_loader/efi_file.c | 75 +- 11 files changed, 1737 insertions(+), 55 deletions(-) create mode 100644 lib/efi_loader/efi_bootmenu_maintenance.c -- 2.17.1

3 17

[PATCH] imx: imx93_11x11_evk: using binman to pack images
by Peng Fan (OSS) 13 Jun '22

13 Jun '22

From: Peng Fan <peng.fan(a)nxp.com> Use BINMAN to generate flash.bin Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- Based on https://patchwork.ozlabs.org/project/uboot/cover/20220611132035.32698-1-pen… arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 2 + arch/arm/dts/imx93-u-boot.dtsi | 84 ++++++++++++++++++++++++ arch/arm/mach-imx/Makefile | 24 +++++++ arch/arm/mach-imx/imx9/Kconfig | 1 + arch/arm/mach-imx/imx9/container.cfg | 11 ++++ arch/arm/mach-imx/imx9/imximage.cfg | 15 +++++ board/freescale/imx93_evk/Kconfig | 6 ++ 7 files changed, 143 insertions(+) create mode 100644 arch/arm/dts/imx93-u-boot.dtsi create mode 100644 arch/arm/mach-imx/imx9/container.cfg create mode 100644 arch/arm/mach-imx/imx9/imximage.cfg diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi index 6f02b389893..e5912a85ca2 100644 --- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi +++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2022 NXP */ +#include "imx8mp-u-boot.dtsi" + / { wdt-reboot { compatible = "wdt-reboot"; diff --git a/arch/arm/dts/imx93-u-boot.dtsi b/arch/arm/dts/imx93-u-boot.dtsi new file mode 100644 index 00000000000..2b6bfd0cb44 --- /dev/null +++ b/arch/arm/dts/imx93-u-boot.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright 2022 NXP + * Peng Fan <peng.fan(a)nxp.com> + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-spl-ddr { + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + blob_1: blob-ext@1 { + filename = "lpddr4_imem_1d_v202201.bin"; + size = <0x8000>; + }; + + blob_2: blob-ext@2 { + filename = "lpddr4_dmem_1d_v202201.bin"; + size = <0x4000>; + }; + + blob_3: blob-ext@3 { + filename = "lpddr4_imem_2d_v202201.bin"; + size = <0x8000>; + }; + + blob_4: blob-ext@4 { + filename = "lpddr4_dmem_2d_v202201.bin"; + size = <0x4000>; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x2049a000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + u-boot-container { + filename = "u-boot-container.bin"; + + mkimage { + args = "-n u-boot-container.cfgout -T imx8image -e 0x0"; + + blob { + filename = "u-boot.bin"; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl: blob-ext@1 { + filename = "spl.bin"; + offset = <0x0>; + align-size = <0x400>; + align = <0x400>; + }; + + uboot: blob-ext@2 { + filename = "u-boot-container.bin"; + }; + }; +}; diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 71ac8e6ffde..2f51226e0d9 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -120,6 +120,9 @@ DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctre else ifeq ($(CONFIG_ARCH_IMX8M), y) IMAGE_TYPE := imx8mimage DEPFILE_EXISTS := 0 +else ifeq ($(CONFIG_ARCH_IMX9), y) +IMAGE_TYPE := imx8image +DEPFILE_EXISTS := 0 else IMAGE_TYPE := imximage DEPFILE_EXISTS := 0 @@ -171,6 +174,27 @@ flash.bin: spl/u-boot-spl-ddr.bin u-boot.itb FORCE $(call if_changed,mkimage) endif +ifeq ($(CONFIG_ARCH_IMX9), y) + +SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout u-boot-container.cfgout FORCE + +MKIMAGEFLAGS_flash.bin = -n spl/u-boot-spl.cfgout -T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE) +flash.bin: MKIMAGEOUTPUT = flash.log + +spl/u-boot-spl.cfgout: $(IMX_CONFIG) FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,cpp_cfg) + +spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE + +u-boot-container.cfgout: $(IMX_CONTAINER_CFG) FORCE + $(Q)mkdir -p $(dir $@) + $(call if_changed_dep,cpp_cfg) + +flash.bin: spl/u-boot-spl-ddr.bin container.cfgout FORCE + $(call if_changed,mkimage) +endif + ifeq ($(CONFIG_ARCH_IMX8), y) SPL: diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig index c06102bae07..0b965376987 100644 --- a/arch/arm/mach-imx/imx9/Kconfig +++ b/arch/arm/mach-imx/imx9/Kconfig @@ -25,6 +25,7 @@ choice config TARGET_IMX93_11X11_EVK bool "imx93_11x11_evk" select IMX93 + select BINMAN endchoice diff --git a/arch/arm/mach-imx/imx9/container.cfg b/arch/arm/mach-imx/imx9/container.cfg new file mode 100644 index 00000000000..baaa17748ff --- /dev/null +++ b/arch/arm/mach-imx/imx9/container.cfg @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2022 NXP + */ + +/* This file is to create a container image could be loaded by SPL */ +BOOT_FROM SD 0x400 +SOC_TYPE IMX9 +CONTAINER +IMAGE A55 bl31.bin 0x204E0000 +IMAGE A55 u-boot.bin CONFIG_SYS_TEXT_BASE diff --git a/arch/arm/mach-imx/imx9/imximage.cfg b/arch/arm/mach-imx/imx9/imximage.cfg new file mode 100644 index 00000000000..fae0c64245f --- /dev/null +++ b/arch/arm/mach-imx/imx9/imximage.cfg @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2022 NXP + */ + +/* Boot from SD, sector size 0x400 */ +BOOT_FROM SD 0x400 +/* SoC type IMX9 */ +SOC_TYPE IMX9 +/* Append sentinel container image */ +APPEND mx93a0-ahab-container.img +/* Create the 2nd container */ +CONTAINER +/* Add spl with exec attribute */ +IMAGE A55 u-boot-spl-ddr.bin 0x2049A000 diff --git a/board/freescale/imx93_evk/Kconfig b/board/freescale/imx93_evk/Kconfig index 032e523198d..17209d939d2 100644 --- a/board/freescale/imx93_evk/Kconfig +++ b/board/freescale/imx93_evk/Kconfig @@ -16,6 +16,12 @@ config IMX93_EVK_LPDDR4X help Select the LPDDR4X timing and 0.6V VDDQ +config IMX_CONFIG + default "arch/arm/mach-imx/imx9/imximage.cfg" + +config IMX_CONTAINER_CFG + default "arch/arm/mach-imx/imx9/container.cfg" + source "board/freescale/common/Kconfig" endif -- 2.36.0

1 0

[PATCH v16 0/2] add TCP and HTTP for downloading images
by Ying-Chun Liu (PaulLiu) 12 Jun '22

12 Jun '22

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> This patch is a refresh from previous patches made by Duncan Hare <DuncanCHare(a)yahoo.com>. I've contacted him and continue to work on this patch. This patch introduce a TCP stack with SACK. And a simple wget command to download images from http server. v1-v12: Made by Duncan, didn't tracked. v13: Fix some issues which is reviewed by Christian v14: Add options to enable/disable SACK. v15: Fix various syntax errors reviewed by Michal. Remove magic numbers. Use kernel-doc format. v16: Add more kernel-doc. Fix more double spaces. Ying-Chun Liu (PaulLiu) (2): net: Add TCP protocol net: Add wget application cmd/Kconfig | 7 + cmd/net.c | 13 + include/net.h | 38 ++- include/net/tcp.h | 312 ++++++++++++++++++++ include/net/wget.h | 22 ++ net/Kconfig | 16 + net/Makefile | 2 + net/net.c | 36 +++ net/tcp.c | 720 +++++++++++++++++++++++++++++++++++++++++++++ net/wget.c | 426 +++++++++++++++++++++++++++ 10 files changed, 1582 insertions(+), 10 deletions(-) create mode 100644 include/net/tcp.h create mode 100644 include/net/wget.h create mode 100644 net/tcp.c create mode 100644 net/wget.c -- 2.35.1

2 3

sandbox: building fails with GENERATE_ACPI_TABLE=y, ACPIGEN=n
by Heinrich Schuchardt 12 Jun '22

12 Jun '22

Hello Simon, sandbox_defconfig with ACPIGEN=n fails to build. We should not have two customizable symbols if the one cannot be set to no without the other. * GENERATE_ACPI_TABLE * ACPIGEN It should be possible to build the sandbox without ACPI tables to test UEFI binaries using device-trees. This requires to get test/dm/Makefile right. Best regards Heinrich

1 0

[PATCH 1/1] mmc: pci_mmc.c should build with ACPIGEN=n
by Heinrich Schuchardt 12 Jun '22

12 Jun '22

sandbox_defconfig builds the PCI MMC driver. It should be possible to build the sandbox without ACPI support. ACPI support in the PCI MMC driver is only needed when creating an ACPI table. Fix building with ACPIGEN=n. Fixes: dba7ee419d9d ("acpi: mmc: Generate ACPI info for the PCI SD Card") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/mmc/pci_mmc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index cba2ea8cf3..9fb7044029 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -86,6 +86,7 @@ static int pci_mmc_bind(struct udevice *dev) return sdhci_bind(dev, &plat->mmc, &plat->cfg); } +__maybe_unused static int pci_mmc_acpi_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx) { @@ -138,7 +139,9 @@ static int pci_mmc_acpi_fill_ssdt(const struct udevice *dev, } struct acpi_ops pci_mmc_acpi_ops = { +#ifdef CONFIG_ACPIGEN .fill_ssdt = pci_mmc_acpi_fill_ssdt, +#endif }; static const struct udevice_id pci_mmc_match[] = { -- 2.36.1

1 0

[PATCH v2 0/2] efi_loader: allow booting from short dev only DP
by Heinrich Schuchardt 12 Jun '22

12 Jun '22

Allow creating boot options without file path, e.g. efidebug boot add -b 0001 'short dev only' host 0:1 '' efidebug boot add -B 0001 'long dev only' host 0:1 '' Allow booting from a short form device-path without file path, e.g. /HD(1,GPT,5ef79931-a1aa-4c70-9d67-611e8f69eafd,0x800,0x1000) v2: update the function description of efi_dp_from_file() Heinrich Schuchardt (2): efi_loader: allow booting from short dev only DP efi_loader: create boot options without file path lib/efi_loader/efi_bootmgr.c | 9 ++++----- lib/efi_loader/efi_device_path.c | 33 +++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 14 deletions(-) -- 2.36.1

1 2

[PATCH 00/12] doc: mkimage: Rework and refactor the man page
by Sean Anderson 12 Jun '22

12 Jun '22

This gives a facelift for the mkimage man page, bringing it in line with the style perscribed by man-pages(7) and groff_man_style(7). I have tried to remove typographical and grammatical errors and inconsistencies wherever possible. The man page now both looks and feels closer to other Linux man pages. As a bonus, I also added a man page for dumpimage in the same style. Sean Anderson (12): doc: mkimage: Use standard style for synopsis doc: mkimage: Use empty request instead of blank lines doc: mkimage: Add vertical/horizontal space to examples doc: mkimage: Regularize option documentation doc: mkimage: Use subsection macro doc: mkimage: Remove duplicate docs for -l doc: mkimage: Use correct capitalization for NAME doc: mkimage: Edit options for style and consistency doc: mkimage: Add BUGS section doc: mkimage: Add SEE ALSO section doc: mkimage: Remove AUTHORS section doc: Add man page for dumpimage doc/dumpimage.1 | 103 ++++++++++ doc/mkimage.1 | 509 ++++++++++++++++++++++++++++++------------------ 2 files changed, 425 insertions(+), 187 deletions(-) create mode 100644 doc/dumpimage.1 -- 2.35.1

1 13

Xilinx Zynq-7000 : Help petalinux patch u-boot env vars
by RisingEdgeIndustries 12 Jun '22

12 Jun '22

Hello, I'm trying to update some of the u-boot environment variables when I build my linux Image using petalinux for the zynq 7000 (zedboard). Looking at the configs folder I found the "xilinx_zynq_virt_defconfig". So my first question is the following. Does this file contain the environment variables I see when I boot u-boot? I want to add some environment variables for u-boot. For example, ipaddr = <my_ipaddr> serverip = <tftp_server_ip> etc.... If this file is not the file one would modify could someone point me to the correct place? My ultimate goal is to use petalinux-devtool (which is yocto devtool - https://docs.yoctoproject.org/ref-manual/devtool-reference.html) to update u-boot so it contains my added environment variables. This tool basically downloads the xilinx u-boot repo and allows changes to be made via the yocto devtool. So that is a little background on why I'm trying to do this modification this way. The recommended approach from my silicon vendor (Xilins) is to use this devtool to "patch" the u-boot source. So long story short, I have the source ready to be patched and built but I don't know exactly what to patch (which source file) so when I boot into u-boot I have the newly added environment variables loaded. Thanks for any help! Robbie Valentine Electrical Engineer RisingEdgeIndustries

2 2

[PATCH 0/2] efi_loader: allow booting from short dev only DP
by Heinrich Schuchardt 12 Jun '22

12 Jun '22

Allow creating boot options without file path, e.g. efidebug boot add -b 0001 'short dev only' host 0:1 '' efidebug boot add -B 0001 'long dev only' host 0:1 '' Allow booting from a short form device-path without file path, e.g. /HD(1,GPT,5ef79931-a1aa-4c70-9d67-611e8f69eafd,0x800,0x1000) Heinrich Schuchardt (2): efi_loader: allow booting from short dev only DP efi_loader: create boot options without file path lib/efi_loader/efi_bootmgr.c | 9 ++++----- lib/efi_loader/efi_device_path.c | 14 ++++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) -- 2.36.1

2 3

[PATCH resend 1/2] imx: imx8mq: default select CLK_IMX8MQ
by Peng Fan (OSS) 11 Jun '22

11 Jun '22

From: Peng Fan <peng.fan(a)nxp.com> Since the power domain driver default select CONFIG_CLK, so we will meet lots failures without CLK_IMX8MQ, so default select it. Fixes: commit 4eb82c2e56a7c ("imx: power-domain: Get rid of SMCCC dependency") Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- arch/arm/mach-imx/imx8m/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 24299ae037..7f23d687be 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -8,6 +8,7 @@ config IMX8M config IMX8MQ bool select IMX8M + select CLK_IMX8MQ config IMX8MM bool -- 2.36.0

3 9