April 2024 - U-Boot

[PATCH v4 0/1] Introduce fastboot oem board command
by Alexey Romanov 18 Apr '24

18 Apr '24

Changes V1 -> V2 [1]: - Added an example of using the command as requested by Sean Anderson [2]. Changes V2 -> V3 [3]: - Rebase over uboot/master. - Add documentation. - Remove example added in V2 [1]. Changes V3 -> V4 [4]: - Corrected documentation accroding to Quentin Schulz comments [5]. Links: [1] https://lore.kernel.org/all/20231228152522.83291-1-avromanov@salutedevices.… [2] https://lore.kernel.org/all/72ac233d-c18d-4f57-bc66-451fe0bd2997@seco.com/ [3] https://lore.kernel.org/all/20240201092027.6258-1-avromanov@salutedevices.c… [4] https://lore.kernel.org/all/20240408101552.539037-1-avromanov@salutedevices… [5] https://lore.kernel.org/all/9efdf140-8da3-4b5e-b1c4-2f106067afd3@theobroma-… Alexey Romanov (1): fastboot: introduce 'oem board' subcommand doc/android/fastboot.rst | 18 ++++++++++++++++++ drivers/fastboot/Kconfig | 7 +++++++ drivers/fastboot/fb_command.c | 30 ++++++++++++++++++++++++++++++ include/fastboot.h | 1 + 4 files changed, 56 insertions(+) -- 2.34.1

3 5

[PATCH v2 1/1] efi_loader: typo mstching
by Heinrich Schuchardt 18 Apr '24

18 Apr '24

%s/mstching/matching/ Reported-by: E Shattow <lucent(a)gmail.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: correct Reported-by line --- lib/efi_loader/efi_var_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index aa8feffd3ec..ed53bcf3939 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -419,7 +419,7 @@ void *efi_get_var(const u16 *name, const efi_guid_t *vendor, efi_uintn_t *size) } /** - * efi_var_collect() - Copy EFI variables mstching attributes mask + * efi_var_collect() - Copy EFI variables matching attributes mask * * @bufp: buffer containing variable collection * @lenp: buffer length -- 2.43.0

2 1

[PATCH 1/1] sandbox: don't call os_close with invalid file descriptor
by Heinrich Schuchardt 18 Apr '24

18 Apr '24

If open() fails it returns -1. Calling close() with this value makes no sense. Return -EIO instead. Addresses-Coverity-ID: 185828 Improper use of negative value Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/sandbox/cpu/os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index cbae5109e85..154a5d77490 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -188,7 +188,7 @@ int os_read_file(const char *fname, void **bufp, int *sizep) fd = os_open(fname, OS_O_RDONLY); if (fd < 0) { printf("Cannot open file '%s'\n", fname); - goto err; + return -EIO; } size = os_filesize(fd); if (size < 0) { -- 2.43.0

3 2

[PATCH] arm: mach-k3: security: Lower verbosity of cert message for GP
by Andrew Davis 18 Apr '24

18 Apr '24

When we find a certificate on an image to be booted on a GP device we print out a message explaining that the certificate is being skipped. This message is rather long and is printed for every image. Shorten the message and make the long version into a debug message. Signed-off-by: Andrew Davis <afd(a)ti.com> --- arch/arm/mach-k3/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c index 22697a263a8..7c46914d9dd 100644 --- a/arch/arm/mach-k3/security.c +++ b/arch/arm/mach-k3/security.c @@ -50,7 +50,7 @@ void ti_secure_image_check_binary(void **p_image, size_t *p_size) if (get_device_type() == K3_DEVICE_TYPE_GP) { if (ti_secure_cert_detected(*p_image)) { - printf("Warning: Detected image signing certificate on GP device. " + debug("Warning: Detected image signing certificate on GP device. " "Skipping certificate to prevent boot failure. " "This will fail if the image was also encrypted\n"); @@ -60,6 +60,7 @@ void ti_secure_image_check_binary(void **p_image, size_t *p_size) return; } + printf("Skipping authentication on GP device\n"); *p_image += cert_length; *p_size -= cert_length; } -- 2.39.2

3 2

[PATCH] configs: am64x_evm_*_defconfig: Increase offsets for eMMC raw boot
by Judith Mendez 18 Apr '24

18 Apr '24

EMMC boot can fail due to the size of R5 SPL image growing beyond the 500KB of memory allocated in eMMC. Update offsets for eMMMC raw boot to load each binary from the correct address in eMMC according to the following eMMC layout: boot0/1 partition 0x0+----------------------------------+ | tiboot3.bin (1 MB) | 0x800+----------------------------------+ | tispl.bin (2 MB) | 0x1800+-----------------------------------+ | u-boot.img (4 MB) | 0x3800+-----------------------------------+ | environment (128 KB) | 0x3900+-----------------------------------+ Signed-off-by: Judith Mendez <jm(a)ti.com> --- configs/am64x_evm_a53_defconfig | 2 +- configs/am64x_evm_r5_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index b7057be3d65..86740559905 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -44,7 +44,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC_SIZE=0x800000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1800 CONFIG_SPL_DMA=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ETH=y diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig index 555d69bb117..4a3780ce660 100644 --- a/configs/am64x_evm_r5_defconfig +++ b/configs/am64x_evm_r5_defconfig @@ -51,7 +51,7 @@ CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x84000000 CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000 CONFIG_SPL_EARLY_BSS=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800 CONFIG_SPL_DMA=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ETH=y base-commit: bc39e06778168a34bb4e0a34fbee4edbde4414d8 -- 2.43.2

2 1

[PATCH v1] configs: arbel: Use generic timer and npcm reset driver
by Jim Liu 18 Apr '24

18 Apr '24

Modify defconfig to use generic timer and npcm reset driver Signed-off-by: Jim Liu <JJLIU0(a)nuvoton.com> --- configs/arbel_evb_defconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/arbel_evb_defconfig b/configs/arbel_evb_defconfig index 45fafe790c..08753aebc0 100644 --- a/configs/arbel_evb_defconfig +++ b/configs/arbel_evb_defconfig @@ -80,7 +80,6 @@ CONFIG_PINCONF=y CONFIG_PINCTRL_NPCM8XX=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_NPCM8XX=y -CONFIG_RESET_SYSCON=y CONFIG_RNG_NPCM=y CONFIG_DM_SERIAL=y CONFIG_NPCM_SERIAL=y @@ -90,8 +89,6 @@ CONFIG_NPCM_FIU_SPI=y CONFIG_NPCM_PSPI=y CONFIG_TEE=y CONFIG_OPTEE=y -CONFIG_TIMER=y -CONFIG_NPCM_TIMER=y CONFIG_TPM2_FTPM_TEE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y -- 2.25.1

2 1

[PATCH 1/1] fs: fat: fill creation and change date
by Heinrich Schuchardt 18 Apr '24

18 Apr '24

The FAT specification requires that the change date is set. If a DM RTC device exists, set the creation and change date to the current date when updating the directory entry. Otherwise use the date 2020-01-01. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- fs/fat/fat_write.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 8b5d669b005..c8e0fbf1a3b 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -18,6 +18,7 @@ #include <rand.h> #include <asm/byteorder.h> #include <asm/cache.h> +#include <dm/uclass.h> #include <linux/ctype.h> #include <linux/math64.h> #include "fat.c" @@ -1151,6 +1152,41 @@ getit: return 0; } +/** + * dentry_set_time() - set change time + * + * @dentptr: directory entry + */ +static void dentry_set_time(dir_entry *dentptr) +{ + if (CONFIG_IS_ENABLED(DM_RTC)) { + struct udevice *dev; + struct rtc_time tm; + u16 date; + u16 time; + + uclass_first_device(UCLASS_RTC, &dev); + if (!dev) + goto err; + if (dm_rtc_get(dev, &tm)) + goto err; + if (tm.tm_year < 1980 || tm.tm_year > 2107) + goto err; + date = (tm.tm_mday & 0x1f) | + ((tm.tm_mon & 0xf) << 5) | + ((tm.tm_year - 1980) << 9); + time = (tm.tm_sec > 1) | + ((tm.tm_min & 0x3f) << 5) | + (tm.tm_hour << 11); + dentptr->date = date; + dentptr->time = time; + return; + } +err: + dentptr->date = 0x2821; /* 2000-01-01 */ + dentptr->time = 0; +} + /** * fill_dentry() - fill directory entry with shortname * @@ -1171,6 +1207,12 @@ static void fill_dentry(fsdata *mydata, dir_entry *dentptr, dentptr->attr = attr; + /* Set change date */ + dentry_set_time(dentptr); + /* Set creation date */ + dentptr->cdate = dentptr->date; + dentptr->ctime = dentptr->time; + memcpy(&dentptr->nameext, shortname, SHORT_NAME_SIZE); } @@ -1376,6 +1418,8 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer, /* Update file size in a directory entry */ retdent->size = cpu_to_le32(pos + size); + /* Update change date */ + dentry_set_time(retdent); } else { /* Create a new file */ char shortname[SHORT_NAME_SIZE]; -- 2.43.0

2 1

[PATCH 1/1] fs: fat: convert change month correctly
by Heinrich Schuchardt 18 Apr '24

18 Apr '24

The month is stored in 5 - 8. We need to shift it by 5 bits. Cf. Microsoft FAT Specification, 2005-08-30 Fixes: 13c11c665320 ("fs: fat: add file attributes to struct fs_dirent") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- fs/fat/fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 14e53cf2d5a..2dd9d4e72dc 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1254,7 +1254,7 @@ out: static void __maybe_unused fat2rtc(u16 date, u16 time, struct rtc_time *tm) { tm->tm_mday = date & 0x1f; - tm->tm_mon = (date & 0x1e0) >> 4; + tm->tm_mon = (date & 0x1e0) >> 5; tm->tm_year = (date >> 9) + 1980; tm->tm_sec = (time & 0x1f) << 1; -- 2.43.0

4 3

[PATCH] tools: copyfile: use 64k instead of 512 buffer
by Ahelenia Ziemiańska 18 Apr '24

18 Apr '24

This is an incredible pessimisation: mkimage took >200ms (and 49489 writes (of which 49456 512)), now it takes 110ms (and 419 writes (of which 386 64k)). sendfile is much more appropriate for this and is done in one syscall, but doesn't bring any significant speedups over 64k r/w at the 13M size ranges, so there's no need to introduce #if __linux__ while((size = sendfile(fd_dst, fd_src, NULL, 128 * 1024 * 1024)) > 0) ; if(size != -1) { ret = 0; goto out; } #endif Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli(a)nabijaczleweli.xyz> --- tools/fit_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/fit_common.c b/tools/fit_common.c index 2d417d47..373fab6a 100644 --- a/tools/fit_common.c +++ b/tools/fit_common.c @@ -145,14 +145,14 @@ int copyfile(const char *src, const char *dst) goto out; } - buf = calloc(1, 512); + buf = calloc(1, 64 * 1024); if (!buf) { printf("Can't allocate buffer to copy file\n"); goto out; } while (1) { - size = read(fd_src, buf, 512); + size = read(fd_src, buf, 64 * 1024); if (size < 0) { printf("Can't read file %s\n", src); goto out; -- 2.39.2

3 9

[PATCH 1/1] test: typo curren
by Heinrich Schuchardt 18 Apr '24

18 Apr '24

Fix typos in test_eficonfig.py: %s/curren/current/ Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/py/tests/test_eficonfig/test_eficonfig.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/py/tests/test_eficonfig/test_eficonfig.py b/test/py/tests/test_eficonfig/test_eficonfig.py index b0a6cc47df2..1d8e033f75d 100644 --- a/test/py/tests/test_eficonfig/test_eficonfig.py +++ b/test/py/tests/test_eficonfig/test_eficonfig.py @@ -224,7 +224,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): # Change the Boot Order press_up_down_enter_and_wait(0, 2, True, None) - # Check the curren BootOrder + # Check the current BootOrder for i in ('test 2', 'test 1', 'host 0:1', 'Save', 'Quit'): u_boot_console.p.expect([i]) # move 'test 2' to the second entry @@ -269,7 +269,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): u_boot_console.run_command('eficonfig', wait_for_prompt=False) # Select 'Edit Boot Option' press_up_down_enter_and_wait(0, 1, True, None) - # Check the curren BootOrder + # Check the current BootOrder for i in ('test 1', 'Quit'): u_boot_console.p.expect([i]) press_up_down_enter_and_wait(0, 0, True, None) @@ -326,7 +326,7 @@ def test_efi_eficonfig(u_boot_console, efi_eficonfig_data): # Select 'Delete Boot Option' press_up_down_enter_and_wait(0, 3, True, None) - # Check the curren BootOrder + # Check the current BootOrder for i in ('test 3', 'Quit'): u_boot_console.p.expect([i]) -- 2.43.0

3 2