January 2023 - U-Boot

[PATCH 0/2] efi: small hii set_keyboard_layout conformance improvement
by Vincent Stehlé 09 Jan '23

09 Jan '23

Hi, The following couple of patches make UEFI HII set_keyboard_layout() more conforming in the case of invalid input parameter and add a selftest. This is sent in this order to avoid breaking `bootefi selftest' in the middle but feel free to apply in any order if preferred. Best regards, Vincent. Vincent Stehlé (2): efi_loader: refine set_keyboard_layout() status efi_selftest: add hii set keyboard layout test case lib/efi_loader/efi_hii.c | 3 +++ lib/efi_selftest/efi_selftest_hii.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) -- 2.39.0

3 4

[PATCH 1/1] doc: fix description of u16_strcasecmp()
by Heinrich Schuchardt 09 Jan '23

09 Jan '23

Remove non-existent parameter 'n' from function description. Fixes: 7a9b366cd9b7 ("lib: add function u16_strcasecmp()") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/charset.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/charset.h b/include/charset.h index 6e79d7152e..44034c71d3 100644 --- a/include/charset.h +++ b/include/charset.h @@ -178,7 +178,6 @@ s32 utf_to_upper(const s32 code); * * @s1: first string to compare * @s2: second string to compare - * @n: maximum number of u16 to compare * Return: 0 if the first n u16 are the same in s1 and s2 * < 0 if the first different u16 in s1 is less than the * corresponding u16 in s2 -- 2.37.2

2 1

[PATCH 1/3] dt-bindings: nvmem: u-boot, env: add MAC's #nvmem-cell-cells
by Rafał Miłecki 08 Jan '23

08 Jan '23

From: Rafał Miłecki <rafal(a)milecki.pl> U-Boot's "ethaddr" environment variable is very often used to store *base* MAC address. It's used as a base for calculating addresses for multiple interfaces. It's done by adding proper values. Actual offsets are picked by manufacturers and vary across devices. Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> --- Documentation/devicetree/bindings/nvmem/u-boot,env.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml b/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml index cbc5c69fd405..1c139bd689ea 100644 --- a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml +++ b/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml @@ -50,7 +50,11 @@ properties: ethaddr: type: object - description: Ethernet interface's MAC address + description: + Ethernet interfaces base MAC address. The first argument is an offset. + properties: + "#nvmem-cell-cells": + const: 1 additionalProperties: false @@ -72,6 +76,7 @@ examples: reg = <0x40000 0x10000>; mac: ethaddr { + #nvmem-cell-cells = <1>; }; }; }; -- 2.34.1

4 5

[PATCH 0/3] sunxi: FEL boot fixes
by Andre Przywara 08 Jan '23

08 Jan '23

While investigating a FEL boot failure on the OrangePi Zero 2 board (with an H616 SoC), I stared at our FEL code and found some issues, which this series fixes. Unfortunately those didn't fix the H616 problem, but they are worth having anyway. For the records on the FEL failure: with certain H616 DRAM parameters, newer GCCs (starting with GCC 11, GCC 10 is fine) generate an SPL binary that doesn't properly return to the BootROM after the SPL code has finished. This does not occur on other H616 boards using different DRAM parameters. Staring at the disassemblies from the different compiler versions for a while didn't show anything obvious, the best theory so far is that it's due to a subtle timing issue in the DRAM initialisation code. Inserting a "udelay(0);" at the beginning of mctl_phy_read_calibration() seems to avoid the problem, but is obviously not a proper fix. I will keep looking. However the issues addressed in this series should be fixed, regardless. Cheers, Andre Andre Przywara (3): sunxi: armv8: fel: load only 32-bit values sunxi: h616: lower SPL stack address to avoid BROM data sunxi: fel: drop redundant "control register" save/restore arch/arm/cpu/armv7/sunxi/fel_utils.S | 4 ---- arch/arm/cpu/armv8/fel_utils.S | 8 ++++---- arch/arm/mach-sunxi/board.c | 1 - include/configs/sunxi-common.h | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) -- 2.25.1

2 6

Pull request for u-boot-nand-20230108
by Dario Binacchi 08 Jan '23

08 Jan '23

Hi Tom, The following changes since commit a95410696d21d38b629c61a09c100197c5fc533a: Merge branch '2023-01-02-platform-updates' into next (2023-01-02 18:07:41 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git tags/u-boot-nand-20230108 for you to fetch changes up to 7363cf0581a3e70b3dbd346dec8b7ae652776f80: mtd: rawnand: omap_elm: u-boot driver model support (2023-01-08 10:38:50 +0100) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-nand-flash/-/pipelines/14646 ---------------------------------------------------------------- Pull request for u-boot-nand-20230108 - rawnand: omap_gpmc: driver model support ---------------------------------------------------------------- Roger Quadros (8): mtd: rawnand: omap_gpmc: Fix BCH6/16 HW based correction mtd: rawnand: nand_base: Allow base driver to be used in SPL without nand_bbt dt-bindings: mtd: Add ti, gpmc-nand DT binding documentation mtd: rawnand: omap_gpmc: support u-boot driver model mtd: rawnand: omap_gpmc: Add SPL NAND support mtd: rawnand: omap_gpmc: Enable SYS_NAND_PAGE_COUNT for OMAP_GPMC dt-bindings: mtd: Add ti, elm DT binding documentation mtd: rawnand: omap_elm: u-boot driver model support doc/device-tree-bindings/mtd/ti,elm.yaml | 72 +++++++++++++++++++++ doc/device-tree-bindings/mtd/ti,gpmc-nand.yaml | 129 ++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/Kconfig | 9 ++- drivers/mtd/nand/raw/Makefile | 2 +- drivers/mtd/nand/raw/nand_base.c | 18 +++++- drivers/mtd/nand/raw/omap_elm.c | 38 +++++++++++- {include/linux/mtd => drivers/mtd/nand/raw}/omap_elm.h | 6 ++ drivers/mtd/nand/raw/omap_gpmc.c | 441 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------- 8 files changed, 607 insertions(+), 108 deletions(-) create mode 100644 doc/device-tree-bindings/mtd/ti,elm.yaml create mode 100644 doc/device-tree-bindings/mtd/ti,gpmc-nand.yaml rename {include/linux/mtd => drivers/mtd/nand/raw}/omap_elm.h (97%) -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi(a)amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info(a)amarulasolutions.com www.amarulasolutions.com

2 1

[PATCH 1/1] efi_loader: add .rela sections to .text on arm64
by Heinrich Schuchardt 08 Jan '23

08 Jan '23

_relocate() needs the information in .rela* for self relocation of the EFI binary. Fixes: d7ddeb66a6ce ("efi_loader: fix building aarch64 EFI binaries") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/arm/lib/elf_aarch64_efi.lds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/lib/elf_aarch64_efi.lds b/arch/arm/lib/elf_aarch64_efi.lds index 3e3da47d6a..5dd9809169 100644 --- a/arch/arm/lib/elf_aarch64_efi.lds +++ b/arch/arm/lib/elf_aarch64_efi.lds @@ -28,6 +28,10 @@ SECTIONS *(.dynamic); . = ALIGN(512); } + .rela.dyn : { *(.rela.dyn) } + .rela.plt : { *(.rela.plt) } + .rela.got : { *(.rela.got) } + .rela.data : { *(.rela.data) *(.rela.data*) } _etext = .; _text_size = . - _text; . = ALIGN(4096); @@ -57,10 +61,6 @@ SECTIONS _edata = .; } :data _data_size = _edata - _data; - .rela.dyn : { *(.rela.dyn) } - .rela.plt : { *(.rela.plt) } - .rela.got : { *(.rela.got) } - .rela.data : { *(.rela.data) *(.rela.data*) } . = ALIGN(4096); .dynsym : { *(.dynsym) } -- 2.37.2

1 0

[PATCH v2 1/2] wandboard: Pass mmc aliases
by Fabio Estevam 08 Jan '23

08 Jan '23

From: Fabio Estevam <festevam(a)denx.de> Originally, the mmc aliases node was present in imx6qdl-wandboard.dtsi. After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it. This causes a regression in which the SD card cannot be found anymore: Since commit the aliases node has been removed U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300) CPU: Freescale i.MX6QP rev1.0 at 792 MHz Reset cause: POR DRAM: 2 GiB Core: 62 devices, 17 uclasses, devicetree: separate PMIC: PFUZE100 ID=0x10 MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the SD card (esdhc3) was mapped to mmc0. Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux") Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v1: - Add patch numbering. arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi | 9 +++++++++ arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi | 1 + 4 files changed, 12 insertions(+) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi diff --git a/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi new file mode 100644 index 000000000000..46c4b3b31f4a --- /dev/null +++ b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; diff --git a/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" -- 2.25.1

3 7

[PATCH 1/1] efi_loader: fix .reloc section of arm64
by Heinrich Schuchardt 08 Jan '23

08 Jan '23

When adding const unsigned short *menu_items[] = { u"abc\n", u"def\n", NULL }; to helloworld.c outside of a function and then referring to the variable in a function the pointer the reference is incorrect. This is due to not considering the generated relocations. Fix the linker script and the PE-COFF header. Fixes: c65d76ed5f81 ("efi: arm: Add aarch64 EFI app support") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/arm/lib/crt0_aarch64_efi.S | 32 ++++++++++++++++---------------- arch/arm/lib/elf_aarch64_efi.lds | 11 +++++++---- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S index 3c2cef6ec7..3520182217 100644 --- a/arch/arm/lib/crt0_aarch64_efi.S +++ b/arch/arm/lib/crt0_aarch64_efi.S @@ -89,22 +89,6 @@ section_table: * because EFI applications must be relocatable. This is a * dummy section as far as we are concerned. */ - .ascii ".reloc" - .byte 0 - .byte 0 /* end of 0 padding of section name */ - .long 0 - .long 0 - .long 0 /* SizeOfRawData */ - .long 0 /* PointerToRawData */ - .long 0 /* PointerToRelocations */ - .long 0 /* PointerToLineNumbers */ - .short 0 /* NumberOfRelocations */ - .short 0 /* NumberOfLineNumbers */ - /* Characteristics (section flags) */ - .long (IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_DISCARDABLE | \ - IMAGE_SCN_CNT_INITIALIZED_DATA) - .ascii ".text" .byte 0 .byte 0 @@ -139,6 +123,22 @@ section_table: IMAGE_SCN_MEM_READ | \ IMAGE_SCN_CNT_INITIALIZED_DATA) + .ascii ".reloc" + .byte 0 + .byte 0 /* end of 0 padding of section name */ + .long _relo_size /* VirtualSize */ + .long _relo - ImageBase /* VirtualAddress */ + .long _relo_size /* SizeOfRawData */ + .long _relo - ImageBase /* PointerToRawData */ + .long 0 /* PointerToRelocations */ + .long 0 /* PointerToLineNumbers */ + .short 0 /* NumberOfRelocations */ + .short 0 /* NumberOfLineNumbers */ + /* Characteristics (section flags) */ + .long (IMAGE_SCN_MEM_READ | \ + IMAGE_SCN_MEM_DISCARDABLE | \ + IMAGE_SCN_CNT_INITIALIZED_DATA) + .align 12 _start: stp x29, x30, [sp, #-32]! diff --git a/arch/arm/lib/elf_aarch64_efi.lds b/arch/arm/lib/elf_aarch64_efi.lds index 3e3da47d6a..1ec2e7fec8 100644 --- a/arch/arm/lib/elf_aarch64_efi.lds +++ b/arch/arm/lib/elf_aarch64_efi.lds @@ -57,10 +57,13 @@ SECTIONS _edata = .; } :data _data_size = _edata - _data; - .rela.dyn : { *(.rela.dyn) } - .rela.plt : { *(.rela.plt) } - .rela.got : { *(.rela.got) } - .rela.data : { *(.rela.data) *(.rela.data*) } + . = ALIGN(4096); + .reloc : { + _relo = .; + *(.rela*) + _erelo = .; + } + _relo_size = _erelo - _relo; . = ALIGN(4096); .dynsym : { *(.dynsym) } -- 2.37.2

1 1

[PATCH] pylibfdt: Allow version normalization to fail
by Tom Rini 08 Jan '23

08 Jan '23

In some cases, we might not have the sic portion of setuputils available. Make our import and use of this be done in try/except blocks as this is done to suppress a run-time warning that is otherwise non-fatal. Reported-by: Pali Rohár <pali(a)kernel.org> Fixes: 141659187667 ("pylibfdt: Fix disable version normalization") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- scripts/dtc/pylibfdt/setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py index c07f65e6bcaf..8baae08770ca 100755 --- a/scripts/dtc/pylibfdt/setup.py +++ b/scripts/dtc/pylibfdt/setup.py @@ -20,12 +20,17 @@ allows this script to be run stand-alone, e.g.: ./pylibfdt/setup.py install [--prefix=...] """ -from setuptools import setup, Extension, sic +from setuptools import setup, Extension from setuptools.command.build_py import build_py as _build_py import os import re import sys +try: + from setuptools import sic +except ImportError: + pass + srcdir = os.path.dirname(__file__) with open(os.path.join(srcdir, "../README"), "r") as fh: @@ -113,7 +118,10 @@ progname = sys.argv[0] files = os.environ.get('SOURCES', '').split() cflags = os.environ.get('CPPFLAGS', '').split() objdir = os.environ.get('OBJDIR') -version = os.environ.get('VERSION') +try: + version = sic(os.environ.get('VERSION')) +except: + version = os.environ.get('VERSION') swig_opts = os.environ.get('SWIG_OPTS', '').split() # If we were called directly rather than through our Makefile (which is often @@ -137,7 +145,7 @@ class build_py(_build_py): setup( name='libfdt', - version=sic(version), + version=version, cmdclass = {'build_py' : build_py}, author='Simon Glass', author_email='sjg(a)chromium.org', -- 2.25.1

1 1

[PATCH] distro_bootcmd: Fix copy-paste error
by Marek Vasut 08 Jan '23

08 Jan '23

The "SCRIPT FAILED" string is copied from scan_dev_for_scripts script, update it so it prints "EXTLINUX FAILED" instead in scan_dev_for_extlinux script. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Frieder Schrempf <frieder.schrempf(a)kontron.de> Cc: Matwey V. Kornilov <matwey.kornilov(a)gmail.com> Cc: Pali Rohar <pali(a)kernel.org> Cc: Peter Hoyes <Peter.Hoyes(a)arm.com> Cc: Tom Rini <trini(a)konsulko.com> --- include/config_distro_bootcmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index fcb319a20ae..c3a2414b914 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -484,7 +484,7 @@ "${prefix}${boot_syslinux_conf}; then " \ "echo Found ${prefix}${boot_syslinux_conf}; " \ "run boot_extlinux; " \ - "echo SCRIPT FAILED: continuing...; " \ + "echo EXTLINUX FAILED: continuing...; " \ "fi\0" \ \ "boot_a_script=" \ -- 2.39.0

2 1