November 2022 - U-Boot

[RFC 1/1] tools: Dockerfile for armv7
by Heinrich Schuchardt 11 Nov '22

11 Nov '22

Provide an armv7 docker environment to build and test the sandbox. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- I have been discussing with Simon, if we can test sandbox_defconfig build on arm in a docker container. This RFC is just a small step on the path to it. --- tools/docker.arm/Dockerfile | 104 ++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 tools/docker.arm/Dockerfile diff --git a/tools/docker.arm/Dockerfile b/tools/docker.arm/Dockerfile new file mode 100644 index 0000000000..9d754da353 --- /dev/null +++ b/tools/docker.arm/Dockerfile @@ -0,0 +1,104 @@ +# SPDX-License-Identifier: GPL-2.0+ +# This Dockerfile is used to build an image for runing the U-Boot sandbox on +# the armv7 architecture. + +FROM ubuntu:jammy-20221003@sha256:60c321f2700325103a0c185adeadfd5a93dbb3cd67dfbdd5b79a8aafa38325c2 + +ENV DEBIAN_FRONTEND=noninteractive + +# Update and install things from apt now +RUN apt-get update && apt-get install -y \ + automake \ + autopoint \ + bc \ + binutils-dev \ + bison \ + build-essential \ + clang-13 \ + coreutils \ + cpio \ + cppcheck \ + curl \ + device-tree-compiler \ + dosfstools \ + e2fsprogs \ + efitools \ + erofs-utils \ + expect \ + fakeroot \ + flex \ + gawk \ + gdisk \ + git \ + gnu-efi \ + gnutls-dev \ + graphviz \ + grub-efi-arm-bin \ + help2man \ + iasl \ + imagemagick \ + iputils-ping \ + libconfuse-dev \ + libgit2-dev \ + libjson-glib-dev \ + libguestfs-tools \ + libgnutls28-dev \ + libgnutls30 \ + liblz4-tool \ + libpixman-1-dev \ + libpython3-dev \ + libsdl1.2-dev \ + libsdl2-dev \ + libseccomp-dev \ + libssl-dev \ + libtool \ + libudev-dev \ + libusb-1.0-0-dev \ + linux-image-generic \ + lzma-alone \ + lzop \ + mount \ + mtd-utils \ + mtools \ + net-tools \ + ninja-build \ + openssl \ + picocom \ + parted \ + pkg-config \ + python-is-python3 \ + python2.7 \ + python3 \ + python3-dev \ + python3-pip \ + python3-sphinx \ + python3-virtualenv \ + rpm2cpio \ + sbsigntool \ + sloccount \ + socat \ + softhsm2 \ + sparse \ + srecord \ + sudo \ + swig \ + util-linux \ + uuid-dev \ + virtualenv \ + xxd \ + zip \ + && rm -rf /var/lib/apt/lists/* + +# Make kernels readable for libguestfs tools to work correctly +RUN chmod +r /boot/vmlinu* + +# Create our user/group +RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot +RUN useradd -m -U uboot +USER uboot:uboot + +# Create the buildman config file +RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman +RUN /bin/echo -e "\n[toolchain-prefix]" >> ~/.buildman +RUN /bin/echo -e "\n[toolchain-alias]" >> ~/.buildman +RUN /bin/echo -e "\nsandbox = arm" >> ~/.buildman -- 2.37.2

3 6

[PATCH] env: Allow string CONFIG options in the text environment
by Simon Glass 10 Nov '22

10 Nov '22

Sometimes it is useful to include a CONFIG option that contains a string. This is hard to do in general, since in many cases it is useful to have the quotes around the string so that, for example: bootcmd=run CONFIG_BOARD_CMD becomes bootcmd=run "boot_board" But for the special case where there is a single quoted, it seems reasonable to suppress the quotes, so that: board=CONFIG_SYS_BOARD becomes board=sandbox Update the script, documentation and tests accordingly. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/usage/environment.rst | 7 ++++++- scripts/env2string.awk | 8 ++++++++ test/py/tests/test_env.py | 10 +++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 15897f63dd9..7272c6abbb4 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -55,7 +55,12 @@ variable but assigning to a new one:: This file can include C-style comments. Blank lines and multi-line variables are supported, and you can use normal C preprocessor directives -and CONFIG defines from your board config also. +and CONFIG defines from your board config also. If the CONFIG value consists of +a string and this is the only thing in the variable, the quotes will be +dropped:: + + something=CONFIG_SYS_BOARD + # where CONFIG_SYS_BOARD is "sandbox" this becomes: something=sandbox For example, for snapper9260 you would create a text file called `board/bluewater/snapper9260.env` containing the environment text. diff --git a/scripts/env2string.awk b/scripts/env2string.awk index de470a49941..3a0fac47d07 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -43,6 +43,14 @@ NF { var = substr($0, 1, RLENGTH - 1) env = substr($0, RLENGTH + 1) + # If the env value consists entirely of a quoted string, drop + # the quotes. This handles things like fred=CONFIG_SYS_BOARD + # which would otherwise result in fred=\"sandbox\" in this + # output and fred="sandbox" in the final environment. + if (length(env) != 0 && match(env, /^\\"([^"]*)\\"$/)) { + env = substr(env, RSTART + 2, RLENGTH - 4) + } + # Deal with += which concatenates the new string to the existing # variable. Again we are careful to use POSIX match() if (length(env) != 0 && match(var, "^(.*)[+]$")) { diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 6d08565f0b5..9bec12a2269 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -588,8 +588,16 @@ e=456 m+= 456''', 'e=456\\0m=123 456\\0') # contains quotes + check_script('''fred=run "my var" +mary=another"''', 'fred=run \\"my var\\"\\0mary=another\\"\\0') + + # contains only a quoted strings, so quotes are removed check_script('''fred="my var" -mary=another"''', 'fred=\\"my var\\"\\0mary=another\\"\\0') +mary=another"''', 'fred=my var\\0mary=another\\"\\0') + + # contains more than one quoted string + check_script('''fred="my var" or "this var" +mary=another"''', 'fred=\\"my var\\" or \\"this var\\"\\0mary=another\\"\\0') # variable name ending in + check_script('''fred\\+=my var -- 2.38.1.431.g37b22c650d-goog

4 8

[PATCH 01/21] Convert CONFIG_SYS_I2C_INIT_BOARD to Kconfig
by Tom Rini 10 Nov '22

10 Nov '22

This converts the following to Kconfig: CONFIG_SYS_I2C_INIT_BOARD Signed-off-by: Tom Rini <trini(a)konsulko.com> --- README | 11 ----------- board/keymile/Kconfig | 3 +++ board/samsung/common/board.c | 4 ---- board/samsung/goni/goni.c | 10 ---------- drivers/i2c/fsl_i2c.c | 7 ------- drivers/i2c/mv_i2c.c | 24 ------------------------ include/configs/km/pg-wcom-ls102xa.h | 1 - 7 files changed, 3 insertions(+), 57 deletions(-) diff --git a/README b/README index 186f1f9a5ffb..92ad191ae76d 100644 --- a/README +++ b/README @@ -1126,17 +1126,6 @@ The following options need to be configured: You should define these to the GPIO value as given directly to the generic GPIO functions. - CONFIG_SYS_I2C_INIT_BOARD - - When a board is reset during an i2c bus transfer - chips might think that the current transfer is still - in progress. On some boards it is possible to access - the i2c SCLK line directly, either by using the - processor pin as a GPIO or by having a second pin - connected to the bus. If this option is defined a - custom i2c_init_board() routine in boards/xxx/board.c - is run early in the boot sequence. - CONFIG_I2C_MULTI_BUS This option allows the use of multiple I2C buses, each of which diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 9f784430b1d5..b8f0578a286f 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -11,6 +11,9 @@ if VENDOR_KM menu "KM Board Setup" +config SYS_I2C_INIT_BOARD + def_bool y if ARM + config HUSH_INIT_VAR def_bool y diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index ff178b7fe677..e476400ecdc8 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -177,10 +177,6 @@ int board_early_init_f(void) return err; } -#ifdef CONFIG_SYS_I2C_INIT_BOARD - board_i2c_init(gd->fdt_blob); -#endif - return exynos_early_init_f(); } #endif diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index ba25ba27b863..535f8e1e0129 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -33,16 +33,6 @@ int board_init(void) return 0; } -#ifdef CONFIG_SYS_I2C_INIT_BOARD -void i2c_init_board(void) -{ - gpio_request(S5PC110_GPIO_J43, "i2c_clk"); - gpio_request(S5PC110_GPIO_J40, "i2c_data"); - gpio_direction_output(S5PC110_GPIO_J43, 1); - gpio_direction_output(S5PC110_GPIO_J40, 1); -} -#endif - int dram_init(void) { gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE + diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 9a3c8241bc64..edbcd83b6469 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -271,13 +271,6 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int const unsigned long long timeout = usec2ticks(CONFIG_I2C_MBB_TIMEOUT); unsigned long long timeval; -#ifdef CONFIG_SYS_I2C_INIT_BOARD - /* Call board specific i2c bus reset routine before accessing the - * environment, which might be in a chip on that bus. For details - * about this problem see doc/I2C_Edge_Conditions. - */ - i2c_init_board(); -#endif writeb(0, &base->cr); /* stop I2C controller */ udelay(5); /* let it shutdown in peace */ set_i2c_bus_speed(base, i2c_clk, speed); diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c index 0eff3531618c..8ee17f0a4501 100644 --- a/drivers/i2c/mv_i2c.c +++ b/drivers/i2c/mv_i2c.c @@ -374,27 +374,6 @@ static int __i2c_write(struct mv_i2c *base, uchar chip, u8 *addr, int alen, static struct mv_i2c *base_glob; -static void i2c_board_init(struct mv_i2c *base) -{ -#ifdef CONFIG_SYS_I2C_INIT_BOARD - u32 icr; - /* - * call board specific i2c bus reset routine before accessing the - * environment, which might be in a chip on that bus. For details - * about this problem see doc/I2C_Edge_Conditions. - * - * disable I2C controller first, otherwhise it thinks we want to - * talk to the slave port... - */ - icr = readl(&base->icr); - writel(readl(&base->icr) & ~(ICR_SCLE | ICR_IUE), &base->icr); - - i2c_init_board(); - - writel(icr, &base->icr); -#endif -} - #ifdef CONFIG_I2C_MULTI_BUS static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG; static unsigned int bus_initialized[CONFIG_MV_I2C_NUM]; @@ -411,7 +390,6 @@ int i2c_set_bus_num(unsigned int bus) current_bus = bus; if (!bus_initialized[current_bus]) { - i2c_board_init(base_glob); bus_initialized[current_bus] = 1; } @@ -441,8 +419,6 @@ void i2c_init(int speed, int slaveaddr) else val = ICR_SM; clrsetbits_le32(&base_glob->icr, ICR_MODE_MASK, val); - - i2c_board_init(base_glob); } static int __i2c_probe_chip(struct mv_i2c *base, uchar chip) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 43471e08d604..9565cea083e0 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -155,7 +155,6 @@ /* * I2C */ -#define CONFIG_SYS_I2C_INIT_BOARD #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_MAX_HOPS 1 -- 2.25.1

3 46

[PATCH] efi_loader: add comments on efi_file_from_path() regarding alignment
by Ilias Apalodimas 10 Nov '22

10 Nov '22

UEFI specification requires pointers that are passed to protocol member functions to be aligned. There's a u16_strdup in that function which doesn't make sense otherwise Add a comment so no one removes it accidentally Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 8480ed3007c7..5c254ccdd64d 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1135,6 +1135,11 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) return NULL; } + /* + * UEFI specification requires pointers that are passed to + * protocol member functions to be aligned. So memcpy it + * unconditionally + */ filename = u16_strdup(fdp->str); if (!filename) return NULL; -- 2.38.1

3 4

[PATCH 1/1] efi_loader: improve description of efi_file_from_path()
by Heinrich Schuchardt 10 Nov '22

10 Nov '22

Provide a description of the function's logic. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_file.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index c96a7f7ca3..ae0ca6101b 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1098,6 +1098,15 @@ static const struct efi_file_handle efi_file_handle_protocol = { /** * efi_file_from_path() - open file via device path * + * The device path @fp consist of the device path of the handle with the + * simple file system protocol and one or more file path device path nodes. + * The concatenation of all file path names provides the total file path. + * + * The code starts at the first file path node and tries to open that file or + * directory. If there is a succeding file path node, the code opens it relative + * to this directory and continues iterating until reaching the last file path + * node. + * * @fp: device path * Return: EFI_FILE_PROTOCOL for the file or NULL */ -- 2.37.2

2 1

[PATCH] efi_loader: remove EFI_CALL from efi_file_from_path()
by Ilias Apalodimas 10 Nov '22

10 Nov '22

We now have internal functions for OpenVolume, EFI_FILE_PROTOCOL.Open() and EFI_FILE_PROTOCOL.Close(). So use these instead of wrapping the callsites with EFI_CALL() Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index c96a7f7ca371..8480ed3007c7 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1111,7 +1111,7 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) if (!v) return NULL; - EFI_CALL(ret = v->open_volume(v, &f)); + ret = efi_open_volume_int(v, &f); if (ret != EFI_SUCCESS) return NULL; @@ -1131,22 +1131,21 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) if (!EFI_DP_TYPE(fp, MEDIA_DEVICE, FILE_PATH)) { printf("bad file path!\n"); - f->close(f); + efi_file_close_int(f); return NULL; } filename = u16_strdup(fdp->str); if (!filename) return NULL; - EFI_CALL(ret = f->open(f, &f2, filename, - EFI_FILE_MODE_READ, 0)); + ret = efi_file_open_int(f, &f2, filename, EFI_FILE_MODE_READ, 0); free(filename); if (ret != EFI_SUCCESS) return NULL; fp = efi_dp_next(fp); - EFI_CALL(f->close(f)); + efi_file_close_int(f); f = f2; } -- 2.38.1

2 1

[PATCH] efi_loader: simplify efi_load_from_path
by Ilias Apalodimas 10 Nov '22

10 Nov '22

The current implementation efi_load_from_path is a bit confusing. First of all it tries to check the device path to make sure it contains the path to the device plus the media path with the filename and nothing in between. But that should already be valid since U-Boot constructs those device paths. On top of that it tries to traverse the device path nodes and acquire the file part by stepping through the nodes of the directory path until the file is reached. We already have efi_dp_split_file_path() for that so rewrite the function and clean it up to use existing code. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_file.c | 52 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index c96a7f7ca371..e1695ba309e4 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1104,53 +1104,33 @@ static const struct efi_file_handle efi_file_handle_protocol = { struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) { struct efi_simple_file_system_protocol *v; - struct efi_file_handle *f; + struct efi_device_path_file_path *mdp; + struct efi_device_path *dev_dp, *file_dp; + struct efi_file_handle *vol_handle, *file_handle = NULL; efi_status_t ret; v = efi_fs_from_path(fp); if (!v) return NULL; - EFI_CALL(ret = v->open_volume(v, &f)); + ret = efi_dp_split_file_path(fp, &dev_dp, &file_dp); if (ret != EFI_SUCCESS) return NULL; + efi_free_pool(dev_dp); - /* Skip over device-path nodes before the file path. */ - while (fp && !EFI_DP_TYPE(fp, MEDIA_DEVICE, FILE_PATH)) - fp = efi_dp_next(fp); - - /* - * Step through the nodes of the directory path until the actual file - * node is reached which is the final node in the device path. - */ - while (fp) { - struct efi_device_path_file_path *fdp = - container_of(fp, struct efi_device_path_file_path, dp); - struct efi_file_handle *f2; - u16 *filename; - - if (!EFI_DP_TYPE(fp, MEDIA_DEVICE, FILE_PATH)) { - printf("bad file path!\n"); - f->close(f); - return NULL; - } - - filename = u16_strdup(fdp->str); - if (!filename) - return NULL; - EFI_CALL(ret = f->open(f, &f2, filename, - EFI_FILE_MODE_READ, 0)); - free(filename); - if (ret != EFI_SUCCESS) - return NULL; - - fp = efi_dp_next(fp); - - EFI_CALL(f->close(f)); - f = f2; + ret = efi_open_volume_int(v, &vol_handle); + if (ret != EFI_SUCCESS) { + efi_free_pool(file_dp); + return NULL; } - return f; + mdp = (struct efi_device_path_file_path *)file_dp; + /* we don't really care about the ret here *file_handle will be NULL */ + ret = efi_file_open_int(vol_handle, &file_handle, mdp->str, EFI_FILE_MODE_READ, 0); + efi_free_pool(file_dp); + efi_file_close_int(vol_handle); + + return file_handle; } efi_status_t efi_open_volume_int(struct efi_simple_file_system_protocol *this, -- 2.38.1

1 1

[PATCH 1/1] cmd: remove superfluous if in eficonfig_edit_boot_option
by Heinrich Schuchardt 10 Nov '22

10 Nov '22

Goto for an immediately succeeding label is superfluous. Fixes: 87d791423ac6 ("eficonfig: menu-driven addition of UEFI boot option") Addresses-Coverity: 376202 ("Identical code for different branches") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/eficonfig.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 2595dd9563..0dc6e7b01e 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -1527,8 +1527,6 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo } ret = eficonfig_set_boot_option(varname, final_dp, final_dp_size, bo->description, tmp); - if (ret != EFI_SUCCESS) - goto out; out: free(tmp); free(bo->optional_data); -- 2.37.2

2 1

[PATCH 1/1] MAINTAINERS: add UEFI commands to EFI PAYLOAD
by Heinrich Schuchardt 10 Nov '22

10 Nov '22

Add the following files to EFI PAYLOAD: - cmd/bootefi.c - cmd/efidebug.c - cmd/eficonfig.c - cmd/nvedit_efi.c Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8d3d528650..141a00edf1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -880,6 +880,10 @@ M: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-efi.git F: arch/arm/lib/*_efi.* +F: cmd/bootefi.c +F: cmd/eficonfig.c +F: cmd/efidebug.c +F: cmd/nvedit_efi.c F: doc/api/efi.rst F: doc/develop/uefi/* F: doc/mkeficapsule.1 -- 2.37.2

2 1

[PATCH v5 0/3] rockpi4: Add capsule update support
by Sughosh Ganu 10 Nov '22

10 Nov '22

Add capsule update support for the RockPi4B and RockPi4C boards. Support is being added for updating the idbloader.img and u-boot.itb firmware images on configurations with the firmware images stored on GPT partitioned uSD card device. Changes since V5: * Get the pointer to struct efi_fw_image through struct efi_capsule_update_info * Mark fw_images array as a static variable * Populate num_image_type_guids through ROCKPI4_UPDATABLE_IMAGES Sughosh Ganu (3): rockchip: capsule: Add functions for supporting capsule updates rockpi4: board: Add firmware image information for capsule updates rockpi4: capsule: Enable UEFI capsule update on RockPi4 boards arch/arm/include/asm/arch-rockchip/misc.h | 1 + arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 153 ++++++++++++++++++++++ board/rockchip/evb_rk3399/evb-rk3399.c | 55 +++++++- configs/rock-pi-4-rk3399_defconfig | 8 ++ configs/rock-pi-4c-rk3399_defconfig | 8 ++ include/configs/rk3399_common.h | 16 +++ 7 files changed, 241 insertions(+), 1 deletion(-) -- 2.34.1

1 3