October 2024 - U-Boot

[PATCH v3 0/2] imx: hab: Make imx_hab_is_enabled dependent on FIELD_RETURN
by Paul Geurts 17 Oct '24

17 Oct '24

The imx_hab_is_enabled function makes sure SPL and U-Boot only blocks the boot process when HAB is actually enabled. Currently only the SEC_CONFIG fuse is checked for this, as this is the fuse that closes the board for HAB. The Field return fuse however is used to permanently disable HAB. This fuse is not taken into account. Take the FIELD_RETURN fuse into account as well when deciding whether HAB is enabled. v2: - Split up into two commits v3: - Fixed support for i.MX8M Plus, which has a fuse pattern

2 4

Re: [PATCH v3 2/6] treewide: bcb: move ab_select command to bcb subcommands
by Mattijs Korpershoek 17 Oct '24

17 Oct '24

On ven., oct. 11, 2024 at 15:30, "Mattijs Korpershoek via groups.io" <mkorpershoek=baylibre.com(a)groups.io> wrote: > Hi Dmitry, > > Thank you for the patch. > > On mar., oct. 08, 2024 at 23:18, Dmitry Rokosov <ddrokosov(a)salutedevices.com> wrote: > >> To enhance code organization, it is beneficial to consolidate all A/B >> BCB management routines into a single super-command. >> The 'bcb' command is an excellent candidate for this purpose. >> >> This patch integrates the separate 'ab_select' command into the 'bcb' >> group as the 'ab_select' subcommand, maintaining the same parameter list >> for consistency. >> >> Signed-off-by: Dmitry Rokosov <ddrokosov(a)salutedevices.com> >> --- >> MAINTAINERS | 1 - >> cmd/Kconfig | 15 +------ >> cmd/Makefile | 1 - >> cmd/ab_select.c | 66 ------------------------------- >> cmd/bcb.c | 63 +++++++++++++++++++++++++++++ >> configs/am57xx_hs_evm_usb_defconfig | 1 - >> configs/khadas-vim3_android_ab_defconfig | 1 - >> configs/khadas-vim3l_android_ab_defconfig | 1 - >> configs/sandbox64_defconfig | 4 +- >> configs/sandbox_defconfig | 4 +- >> doc/android/ab.rst | 12 +++--- >> include/configs/khadas-vim3_android.h | 2 +- >> include/configs/khadas-vim3l_android.h | 2 +- >> include/configs/meson64_android.h | 4 +- >> include/configs/ti_omap5_common.h | 4 +- >> test/py/tests/test_android/test_ab.py | 8 ++-- >> 16 files changed, 85 insertions(+), 104 deletions(-) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 7aefda93d017f07d616f0f6d191129914fbeb484..668ccec9ae6df47192b1af668e3fdbeb1dfa15ea 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -65,7 +65,6 @@ R: Sam Protsenko <semen.protsenko(a)linaro.org> >> S: Maintained >> T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git >> F: boot/android_ab.c >> -F: cmd/ab_select.c >> F: doc/android/ab.rst >> F: include/android_ab.h >> F: test/py/tests/test_android/test_ab.py >> diff --git a/cmd/Kconfig b/cmd/Kconfig >> index dd33266cec70a2b134b7244acae1b7f098b921e8..11e8d363dc9b137723a86a240412d82dd0dbccc5 100644 >> --- a/cmd/Kconfig >> +++ b/cmd/Kconfig >> @@ -1067,6 +1067,7 @@ config CMD_ADC >> config CMD_BCB >> bool "bcb" >> depends on PARTITIONS >> + depends on ANDROID_AB > > When building with khadas-vim3_android_defconfig, we can see that CMD_BCB is no > longer part of that build: > > $ grep CMD_BCB .config > <empty> > > However, if we look at include/configs/meson64_android.h, we can see > that the "bcb" command is not only used for checking the _slot suffix. > > It's also used for checking the bootloader reason. For example, in > BOOTENV_DEV_FASTBOOT, we call: > > "if bcb test command = bootonce-bootloader; then " \ > > Since CMD_BCB is no longer part of the .config (due to this dependency), > the boot script now shows errors: > > """ > U-Boot 2024.10-00796-g969325278805 (Oct 11 2024 - 14:46:00 +0200) khadas-vim3 > > Model: Khadas VIM3 > SoC: Amlogic Meson G12B (A311D) Revision 29:b (10:2) > DRAM: 2 GiB (effective 3.8 GiB) > Core: 411 devices, 36 uclasses, devicetree: separate > MMC: mmc@ffe03000: 0, mmc@ffe05000: 1, mmc@ffe07000: 2 > Loading Environment from MMC... fs uses incompatible features: 00020000, ignoring > Reading from MMC(2)... *** Warning - bad CRC, using default environment > > In: usbkbd,serial > Out: vidconsole,serial > Err: vidconsole,serial > Net: eth0: ethernet@ff3f0000 > > Hit any key to stop autoboot: 0 > Verify GPT: success! > Unknown command 'bcb' - try 'help' > Warning: BCB is corrupted or does not exist > dev: pinctrl@14 > dev: pinctrl@40 > gpio: pin 88 (gpio 88) value is 1 > Unknown command 'bcb' - try 'help' > Warning: BCB is corrupted or does not exist > Loading Android boot partition... > switch to partitions #0, OK > mmc2(part 0) is current device > """ > > I know we should not be using a boot script, nor non A/B configs but > it's a bummer that this series breaks an upstream > defconfig (khadas-vim3_android_defconfig) > > My recommendation: > > Make BCB_CMD_AB_SELECT implementation dependant on ANDROID_AB. > This way, users can use CMD_BCB with and without ANDROID_AB being enabled. > > We could do: > When ANDROID_AB=y, implement bcb ab_select subcommand > When ANDROID_AB=n, command is not accessible. > > I'll send you a diff shortly for this. Here is an illustration on how that would work: diff --git a/cmd/Kconfig b/cmd/Kconfig index 861c31e26408..e1a4a97b042d 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1055,7 +1055,6 @@ config CMD_ADC config CMD_BCB bool "bcb" depends on PARTITIONS - depends on ANDROID_AB help Read/modify/write the fields of Bootloader Control Block, usually stored on the flash "misc" partition with its structure defined in: diff --git a/cmd/bcb.c b/cmd/bcb.c index 4fd32186ae65..4fe634f14cc5 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -438,6 +438,9 @@ static int do_bcb_ab_select(struct cmd_tbl *cmdtp, int flag, int argc, char slot[2]; bool dec_tries = true; + if (!CONFIG_IS_ENABLED(AB_SELECT)) + return CMD_RET_SUCCESS; + for (int i = 4; i < argc; i++) { if (!strcmp(argv[i], "--no-dec")) dec_tries = false; @@ -474,6 +477,9 @@ static int do_bcb_ab_dump(struct cmd_tbl *cmdtp, int flag, int argc, struct blk_desc *dev_desc; struct disk_partition part_info; + if (!CONFIG_IS_ENABLED(AB_SELECT)) + return CMD_RET_SUCCESS; + if (part_get_info_by_dev_and_name_or_num(argv[1], argv[2], &dev_desc, &part_info, false) < 0) { > >> help >> Read/modify/write the fields of Bootloader Control Block, usually >> stored on the flash "misc" partition with its structure defined in: >> @@ -1789,20 +1790,6 @@ config CMD_XXD >> >> endmenu >> >> -menu "Android support commands" >> - >> -config CMD_AB_SELECT >> - bool "ab_select" >> - depends on ANDROID_AB >> - help >> - On Android devices with more than one boot slot (multiple copies of >> - the kernel and system images) this provides a command to select which >> - slot should be used to boot from and register the boot attempt. This >> - is used by the new A/B update model where one slot is updated in the >> - background while running from the other slot. >> - >> -endmenu >> - >> if NET >> >> menuconfig CMD_NET >> diff --git a/cmd/Makefile b/cmd/Makefile >> index 91227f1249cbda5f7b383e8865c8cc23f3ad5f44..0fd7da3c0de91822c4299cc7034193c497d622b1 100644 >> --- a/cmd/Makefile >> +++ b/cmd/Makefile >> @@ -17,7 +17,6 @@ obj-$(CONFIG_CMD_2048) += 2048.o >> obj-$(CONFIG_CMD_ACPI) += acpi.o >> obj-$(CONFIG_CMD_ADDRMAP) += addrmap.o >> obj-$(CONFIG_CMD_AES) += aes.o >> -obj-$(CONFIG_CMD_AB_SELECT) += ab_select.o >> obj-$(CONFIG_CMD_ADC) += adc.o >> obj-$(CONFIG_CMD_ARMFLASH) += armflash.o >> obj-$(CONFIG_BLK) += blk_common.o >> diff --git a/cmd/ab_select.c b/cmd/ab_select.c >> deleted file mode 100644 >> index 7c178c728ca4c8b5bcba02a04eef2d6a7c86afb6..0000000000000000000000000000000000000000 >> --- a/cmd/ab_select.c >> +++ /dev/null >> @@ -1,66 +0,0 @@ >> -// SPDX-License-Identifier: BSD-2-Clause >> -/* >> - * Copyright (C) 2017 The Android Open Source Project >> - */ >> - >> -#include <android_ab.h> >> -#include <command.h> >> -#include <env.h> >> -#include <part.h> >> - >> -static int do_ab_select(struct cmd_tbl *cmdtp, int flag, int argc, >> - char *const argv[]) >> -{ >> - int ret; >> - struct blk_desc *dev_desc; >> - struct disk_partition part_info; >> - char slot[2]; >> - bool dec_tries = true; >> - >> - if (argc < 4) >> - return CMD_RET_USAGE; >> - >> - for (int i = 4; i < argc; i++) { >> - if (strcmp(argv[i], "--no-dec") == 0) { >> - dec_tries = false; >> - } else { >> - return CMD_RET_USAGE; >> - } >> - } >> - >> - /* Lookup the "misc" partition from argv[2] and argv[3] */ >> - if (part_get_info_by_dev_and_name_or_num(argv[2], argv[3], >> - &dev_desc, &part_info, >> - false) < 0) { >> - return CMD_RET_FAILURE; >> - } >> - >> - ret = ab_select_slot(dev_desc, &part_info, dec_tries); >> - if (ret < 0) { >> - printf("Android boot failed, error %d.\n", ret); >> - return CMD_RET_FAILURE; >> - } >> - >> - /* Android standard slot names are 'a', 'b', ... */ >> - slot[0] = BOOT_SLOT_NAME(ret); >> - slot[1] = '\0'; >> - env_set(argv[1], slot); >> - printf("ANDROID: Booting slot: %s\n", slot); >> - return CMD_RET_SUCCESS; >> -} >> - >> -U_BOOT_CMD(ab_select, 5, 0, do_ab_select, >> - "Select the slot used to boot from and register the boot attempt.", >> - "<slot_var_name> <interface> <dev[:part|#part_name]> [--no-dec]\n" >> - " - Load the slot metadata from the partition 'part' on\n" >> - " device type 'interface' instance 'dev' and store the active\n" >> - " slot in the 'slot_var_name' variable. This also updates the\n" >> - " Android slot metadata with a boot attempt, which can cause\n" >> - " successive calls to this function to return a different result\n" >> - " if the returned slot runs out of boot attempts.\n" >> - " - If 'part_name' is passed, preceded with a # instead of :, the\n" >> - " partition name whose label is 'part_name' will be looked up in\n" >> - " the partition table. This is commonly the \"misc\" partition.\n" >> - " - If '--no-dec' is set, the number of tries remaining will not\n" >> - " decremented for the selected boot slot\n" >> -); >> diff --git a/cmd/bcb.c b/cmd/bcb.c >> index 97a96c009641cc094645607ef833575f3c03fe4b..4f3b8a1538a1f05b8b4a1a51c8962c422981166a 100644 >> --- a/cmd/bcb.c >> +++ b/cmd/bcb.c >> @@ -8,6 +8,7 @@ >> #include <android_bootloader_message.h> >> #include <bcb.h> >> #include <command.h> >> +#include <android_ab.h> >> #include <display_options.h> >> #include <log.h> >> #include <part.h> >> @@ -23,6 +24,7 @@ enum bcb_cmd { >> BCB_CMD_FIELD_TEST, >> BCB_CMD_FIELD_DUMP, >> BCB_CMD_STORE, >> + BCB_CMD_AB_SELECT, >> }; >> >> static const char * const fields[] = { >> @@ -52,6 +54,8 @@ static int bcb_cmd_get(char *cmd) >> return BCB_CMD_STORE; >> if (!strcmp(cmd, "dump")) >> return BCB_CMD_FIELD_DUMP; >> + if (!strcmp(cmd, "ab_select")) >> + return BCB_CMD_AB_SELECT; >> else >> return -1; >> } >> @@ -85,6 +89,10 @@ static int bcb_is_misused(int argc, char *const argv[]) >> if (argc != 2) >> goto err; >> break; >> + case BCB_CMD_AB_SELECT: >> + if (argc != 4 && argc != 5) >> + goto err; >> + return 0; >> default: >> printf("Error: 'bcb %s' not supported\n", argv[0]); >> return -1; >> @@ -414,6 +422,44 @@ void bcb_reset(void) >> __bcb_reset(); >> } >> >> +static int do_bcb_ab_select(struct cmd_tbl *cmdtp, int flag, int argc, >> + char * const argv[]) >> +{ >> + int ret; >> + struct blk_desc *dev_desc; >> + struct disk_partition part_info; >> + char slot[2]; >> + bool dec_tries = true; >> + >> + for (int i = 4; i < argc; i++) { >> + if (strcmp(argv[i], "--no-dec") == 0) >> + dec_tries = false; >> + else >> + return CMD_RET_USAGE; >> + } >> + >> + /* Lookup the "misc" partition from argv[2] and argv[3] */ >> + if (part_get_info_by_dev_and_name_or_num(argv[2], argv[3], >> + &dev_desc, &part_info, >> + false) < 0) { >> + return CMD_RET_FAILURE; >> + } >> + >> + ret = ab_select_slot(dev_desc, &part_info, dec_tries); >> + if (ret < 0) { >> + printf("Android boot failed, error %d.\n", ret); >> + return CMD_RET_FAILURE; >> + } >> + >> + /* Android standard slot names are 'a', 'b', ... */ >> + slot[0] = BOOT_SLOT_NAME(ret); >> + slot[1] = '\0'; >> + env_set(argv[1], slot); >> + printf("ANDROID: Booting slot: %s\n", slot); >> + >> + return CMD_RET_SUCCESS; >> +} >> + >> static struct cmd_tbl cmd_bcb_sub[] = { >> U_BOOT_CMD_MKENT(load, CONFIG_SYS_MAXARGS, 1, do_bcb_load, "", ""), >> U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 1, do_bcb_set, "", ""), >> @@ -421,6 +467,8 @@ static struct cmd_tbl cmd_bcb_sub[] = { >> U_BOOT_CMD_MKENT(test, CONFIG_SYS_MAXARGS, 1, do_bcb_test, "", ""), >> U_BOOT_CMD_MKENT(dump, CONFIG_SYS_MAXARGS, 1, do_bcb_dump, "", ""), >> U_BOOT_CMD_MKENT(store, CONFIG_SYS_MAXARGS, 1, do_bcb_store, "", ""), >> + U_BOOT_CMD_MKENT(ab_select, CONFIG_SYS_MAXARGS, 1, >> + do_bcb_ab_select, "", ""), >> }; >> >> static int do_bcb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) >> @@ -460,6 +508,21 @@ U_BOOT_CMD( >> "bcb dump <field> - dump BCB <field>\n" >> "bcb store - store BCB back to <interface>\n" >> "\n" >> + "bcb ab_select -\n" >> + " Select the slot used to boot from and register the boot attempt.\n" >> + " <slot_var_name> <interface> <dev[:part|#part_name]> [--no-dec]\n" >> + " - Load the slot metadata from the partition 'part' on\n" >> + " device type 'interface' instance 'dev' and store the active\n" >> + " slot in the 'slot_var_name' variable. This also updates the\n" >> + " Android slot metadata with a boot attempt, which can cause\n" >> + " successive calls to this function to return a different result\n" >> + " if the returned slot runs out of boot attempts.\n" >> + " - If 'part_name' is passed, preceded with a # instead of :, the\n" >> + " partition name whose label is 'part_name' will be looked up in\n" >> + " the partition table. This is commonly the \"misc\" partition.\n" >> + " - If '--no-dec' is set, the number of tries remaining will not\n" >> + " decremented for the selected boot slot\n" >> + "\n" >> "Legend:\n" >> "<interface> - storage device interface (virtio, mmc, etc)\n" >> "<dev> - storage device index containing the BCB partition\n" >> diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig >> index 81a938339d5934605cb7defa04ea92f76468b21a..2d8068ecdc79c01c1281ab3873fc892aa4c96be7 100644 >> --- a/configs/am57xx_hs_evm_usb_defconfig >> +++ b/configs/am57xx_hs_evm_usb_defconfig >> @@ -46,7 +46,6 @@ CONFIG_CMD_ADTIMG=y >> CONFIG_CMD_ABOOTIMG=y >> CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 >> CONFIG_CMD_BCB=y >> -CONFIG_CMD_AB_SELECT=y >> CONFIG_BOOTP_DNS2=y >> # CONFIG_CMD_PMIC is not set >> CONFIG_CMD_AVB=y >> diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig >> index 510fe4f8928fe39a040a615636fa550b3e0dc5db..de5357c45cbfe4742d9491a29386850570acc235 100644 >> --- a/configs/khadas-vim3_android_ab_defconfig >> +++ b/configs/khadas-vim3_android_ab_defconfig >> @@ -47,7 +47,6 @@ CONFIG_CMD_SPI=y >> CONFIG_CMD_USB=y >> CONFIG_CMD_USB_MASS_STORAGE=y >> # CONFIG_CMD_SETEXPR is not set >> -CONFIG_CMD_AB_SELECT=y >> CONFIG_CMD_REGULATOR=y >> CONFIG_CMD_AVB=y >> CONFIG_OF_CONTROL=y >> diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig >> index d2da8ff2a69b209b8fb22a48be537bd4dd17a3bb..4d7b90f23002e464d7dc40516bcd3161b0f59439 100644 >> --- a/configs/khadas-vim3l_android_ab_defconfig >> +++ b/configs/khadas-vim3l_android_ab_defconfig >> @@ -47,7 +47,6 @@ CONFIG_CMD_SPI=y >> CONFIG_CMD_USB=y >> CONFIG_CMD_USB_MASS_STORAGE=y >> # CONFIG_CMD_SETEXPR is not set >> -CONFIG_CMD_AB_SELECT=y >> CONFIG_CMD_REGULATOR=y >> CONFIG_CMD_AVB=y >> CONFIG_OF_CONTROL=y >> diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig >> index e2f57c11f0e110917928695936d1066bfc4e8902..e598d44359fff493f31d2a2f25697a3bc78cf0a8 100644 >> --- a/configs/sandbox64_defconfig >> +++ b/configs/sandbox64_defconfig >> @@ -27,6 +27,7 @@ CONFIG_CONSOLE_RECORD=y >> CONFIG_CONSOLE_RECORD_OUT_SIZE=0x6000 >> CONFIG_PRE_CONSOLE_BUFFER=y >> CONFIG_DISPLAY_BOARDINFO_LATE=y >> +CONFIG_ANDROID_AB=y >> CONFIG_CMD_CPU=y >> CONFIG_CMD_LICENSE=y >> CONFIG_CMD_BOOTZ=y >> @@ -46,6 +47,7 @@ CONFIG_CMD_MD5SUM=y >> CONFIG_CMD_MEMINFO=y >> CONFIG_CMD_MX_CYCLIC=y >> CONFIG_CMD_MEMTEST=y >> +CONFIG_CMD_BCB=y >> CONFIG_CMD_DEMO=y >> CONFIG_CMD_GPIO=y >> CONFIG_CMD_GPT=y >> @@ -169,8 +171,8 @@ CONFIG_PWRSEQ=y >> CONFIG_I2C_EEPROM=y >> CONFIG_MMC_SANDBOX=y >> CONFIG_DM_MTD=y >> -CONFIG_MTD_RAW_NAND=y >> CONFIG_SYS_MAX_NAND_DEVICE=8 >> +CONFIG_MTD_RAW_NAND=y >> CONFIG_SYS_NAND_USE_FLASH_BBT=y >> CONFIG_NAND_SANDBOX=y >> CONFIG_SYS_NAND_ONFI_DETECTION=y >> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig >> index 540ccef895059a57632d565d210bb449245e644d..6211c0f9ac916448d6730cee6144034966d0d1f6 100644 >> --- a/configs/sandbox_defconfig >> +++ b/configs/sandbox_defconfig >> @@ -75,6 +75,7 @@ CONFIG_CMD_MEMINFO=y >> CONFIG_CMD_MEM_SEARCH=y >> CONFIG_CMD_MX_CYCLIC=y >> CONFIG_CMD_MEMTEST=y >> +CONFIG_CMD_BCB=y >> CONFIG_CMD_DEMO=y >> CONFIG_CMD_GPIO=y >> CONFIG_CMD_GPIO_READ=y >> @@ -102,7 +103,6 @@ CONFIG_CMD_AXI=y >> CONFIG_CMD_CAT=y >> CONFIG_CMD_SETEXPR_FMT=y >> CONFIG_CMD_XXD=y >> -CONFIG_CMD_AB_SELECT=y >> CONFIG_CMD_DHCP6=y >> CONFIG_BOOTP_DNS2=y >> CONFIG_CMD_PCAP=y >> @@ -228,8 +228,8 @@ CONFIG_MMC_PCI=y >> CONFIG_MMC_SANDBOX=y >> CONFIG_MMC_SDHCI=y >> CONFIG_DM_MTD=y >> -CONFIG_MTD_RAW_NAND=y >> CONFIG_SYS_MAX_NAND_DEVICE=8 >> +CONFIG_MTD_RAW_NAND=y >> CONFIG_SYS_NAND_USE_FLASH_BBT=y >> CONFIG_NAND_SANDBOX=y >> CONFIG_SYS_NAND_ONFI_DETECTION=y >> diff --git a/doc/android/ab.rst b/doc/android/ab.rst >> index 2adf88781d60b61d1b3c74efe976a684b590c813..7fd4aeb6a724b839de9be5e9a8843ade2ad3667e 100644 >> --- a/doc/android/ab.rst >> +++ b/doc/android/ab.rst >> @@ -18,7 +18,7 @@ The A/B updates support can be activated by specifying next options in >> your board configuration file:: >> >> CONFIG_ANDROID_AB=y >> - CONFIG_CMD_AB_SELECT=y >> + CONFIG_CMD_BCB=y >> >> The disk space on target device must be partitioned in a way so that each >> partition which needs to be updated has two or more instances. The name of >> @@ -26,8 +26,8 @@ each instance must be formed by adding suffixes: ``_a``, ``_b``, ``_c``, etc. >> For example: ``boot_a``, ``boot_b``, ``system_a``, ``system_b``, ``vendor_a``, >> ``vendor_b``. >> >> -As a result you can use ``ab_select`` command to ensure A/B boot process in your >> -boot script. This command analyzes and processes A/B metadata stored on a >> +As a result you can use ``bcb ab_select`` command to ensure A/B boot process in >> +your boot script. This command analyzes and processes A/B metadata stored on a >> special partition (e.g. ``misc``) and determines which slot should be used for >> booting up. >> >> @@ -42,15 +42,15 @@ Command usage >> >> .. code-block:: none >> >> - ab_select <slot_var_name> <interface> <dev[:part_number|#part_name]> >> + bcb ab_select <slot_var_name> <interface> <dev[:part_number|#part_name]> >> >> for example:: >> >> - => ab_select slot_name mmc 1:4 >> + => bcb ab_select slot_name mmc 1:4 >> >> or:: >> >> - => ab_select slot_name mmc 1#misc >> + => bcb ab_select slot_name mmc 1#misc >> >> Result:: >> >> diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h >> index da6adf6c413add03413f40987959a24ad0d41e62..5468ac5878b34b82a70db84c209bab9f3a9dd79f 100644 >> --- a/include/configs/khadas-vim3_android.h >> +++ b/include/configs/khadas-vim3_android.h >> @@ -12,7 +12,7 @@ >> #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" >> #define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" >> >> -#if defined(CONFIG_CMD_AB_SELECT) >> +#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) >> #define PARTS_DEFAULT \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> diff --git a/include/configs/khadas-vim3l_android.h b/include/configs/khadas-vim3l_android.h >> index b1768e2d821176452254fb07f2e3747402b9b4fd..32821b942109feae5ade9f7fd02924bca34cf58b 100644 >> --- a/include/configs/khadas-vim3l_android.h >> +++ b/include/configs/khadas-vim3l_android.h >> @@ -12,7 +12,7 @@ >> #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" >> #define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" >> >> -#if defined(CONFIG_CMD_AB_SELECT) >> +#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) >> #define PARTS_DEFAULT \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \ >> diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h >> index c0e977abb01fb9efb7a462906a0073c84c800897..cc626dbf02418a49b367c8386797ce6ffc28c85b 100644 >> --- a/include/configs/meson64_android.h >> +++ b/include/configs/meson64_android.h >> @@ -47,13 +47,13 @@ >> #define AVB_VERIFY_CMD "" >> #endif >> >> -#if defined(CONFIG_CMD_AB_SELECT) >> +#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) >> #define ANDROIDBOOT_GET_CURRENT_SLOT_CMD "get_current_slot=" \ >> "if part number mmc ${mmcdev} " CONTROL_PARTITION " control_part_number; " \ >> "then " \ >> "echo " CONTROL_PARTITION \ >> " partition number:${control_part_number};" \ >> - "ab_select current_slot mmc ${mmcdev}:${control_part_number};" \ >> + "bcb ab_select current_slot mmc ${mmcdev}:${control_part_number};" \ >> "else " \ >> "echo " CONTROL_PARTITION " partition not found;" \ >> "fi;\0" >> diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h >> index 26494ae980108ad84eb173a0deaa7b701a5309d4..26b6c1cd188c05371c6455cd6247f07a1773d885 100644 >> --- a/include/configs/ti_omap5_common.h >> +++ b/include/configs/ti_omap5_common.h >> @@ -93,13 +93,13 @@ >> >> #define CONTROL_PARTITION "misc" >> >> -#if defined(CONFIG_CMD_AB_SELECT) >> +#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) >> #define AB_SELECT_SLOT \ >> "if part number mmc 1 " CONTROL_PARTITION " control_part_number; " \ >> "then " \ >> "echo " CONTROL_PARTITION \ >> " partition number:${control_part_number};" \ >> - "ab_select slot_name mmc ${mmcdev}:${control_part_number};" \ >> + "bcb ab_select slot_name mmc ${mmcdev}:${control_part_number};" \ >> "else " \ >> "echo " CONTROL_PARTITION " partition not found;" \ >> "exit;" \ >> diff --git a/test/py/tests/test_android/test_ab.py b/test/py/tests/test_android/test_ab.py >> index c79cb07fda35dfeb608ac7345cd3f22744e2e491..0d7b7995a9fab6e3daad748721818b9e4cfac452 100644 >> --- a/test/py/tests/test_android/test_ab.py >> +++ b/test/py/tests/test_android/test_ab.py >> @@ -56,20 +56,20 @@ def ab_disk_image(u_boot_console): >> >> @pytest.mark.boardspec('sandbox') >> @pytest.mark.buildconfigspec('android_ab') >> -(a)pytest.mark.buildconfigspec('cmd_ab_select') >> +(a)pytest.mark.buildconfigspec('cmd_bcb') >> @pytest.mark.requiredtool('sgdisk') >> def test_ab(ab_disk_image, u_boot_console): >> - """Test the 'ab_select' command.""" >> + """Test the 'bcb ab_select' command.""" >> >> u_boot_console.run_command('host bind 0 ' + ab_disk_image.path) >> >> - output = u_boot_console.run_command('ab_select slot_name host 0#misc') >> + output = u_boot_console.run_command('bcb ab_select slot_name host 0#misc') >> assert 're-initializing A/B metadata' in output >> assert 'Attempting slot a, tries remaining 7' in output >> output = u_boot_console.run_command('printenv slot_name') >> assert 'slot_name=a' in output >> >> - output = u_boot_console.run_command('ab_select slot_name host 0:1') >> + output = u_boot_console.run_command('bcb ab_select slot_name host 0:1') >> assert 'Attempting slot b, tries remaining 7' in output >> output = u_boot_console.run_command('printenv slot_name') >> assert 'slot_name=b' in output >> >> -- >> 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#2439): https://groups.io/g/u-boot-amlogic/message/2439 > Mute This Topic: https://groups.io/mt/108948527/1991006 > Group Owner: u-boot-amlogic+owner(a)groups.io > Unsubscribe: https://groups.io/g/u-boot-amlogic/unsub [mkorpershoek(a)baylibre.com] > -=-=-=-=-=-=-=-=-=-=-=-

3 13

[PATCH] efi_loader: Don't allocate from Special purpose memory
by Ilias Apalodimas 17 Oct '24

17 Oct '24

The EFI spec defines special-purpose memory in §7.2. That memory serves as a hint to the OS to avoid allocating this memory for core OS data or code that can not be relocated. So let's ignore it when allocating from conventional memory. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_memory.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index c6f1dd09456e..74732e37f8aa 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -422,7 +422,8 @@ static efi_status_t efi_check_allocated(u64 addr, bool must_be_allocated) if (addr >= start && addr < end) { if (must_be_allocated ^ - (item->desc.type == EFI_CONVENTIONAL_MEMORY)) + (item->desc.type == EFI_CONVENTIONAL_MEMORY) && + !(item->desc.attribute & EFI_MEMORY_SP)) return EFI_SUCCESS; else return EFI_NOT_FOUND; @@ -460,6 +461,9 @@ static uint64_t efi_find_free_memory(uint64_t len, uint64_t max_addr) if (desc->type != EFI_CONVENTIONAL_MEMORY) continue; + if (desc->attribute & EFI_MEMORY_SP) + continue; + /* Out of bounds for max_addr */ if ((ret + len) > max_addr) continue; -- 2.45.2

3 5

[PATCH] cpu: imx8_cpu: Avoid revision to corrupt device tree
by Peng Fan (OSS) 17 Oct '24

17 Oct '24

From: Peng Fan <peng.fan(a)nxp.com> U-Boot device tree is padded just after U-Boot proper. After the whole stuff loaded to DRAM space, the device tree area is conflict with BSS region before U-Boot relocation. So any write to BSS area before reloc_fdt will corrupt the device tree. Without the fix, there is issue that “binman_init failed:-2” on i.MX8MP-EVK board. Move the variable to data section to fix the issue Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/cpu/imx8_cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 6c0a8c0cbe4..19c65c7ce47 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -71,7 +71,7 @@ static const char *get_imx_type_str(u32 imxtype) static const char *get_imx_rev_str(u32 rev) { - static char revision[4]; + static char revision[4] __section(".data"); if (IS_ENABLED(CONFIG_IMX8)) { switch (rev) { -- 2.35.3

4 11

[PATCH v7 0/6] FUSB302 USB-C controller support
by Sebastian Reichel 17 Oct '24

17 Oct '24

Hi, On ROCK 5B power is usually supplied via it's USB-C port. This port has the data lines connected to RK3588, VBUS connected to the input regulator and CC pins connected to FUSB302. FUSB302 is a USB-C controller, which can be accessed via I2C from RK3588. The USB-C controller is needed to figure out the USB-C cable orientation, but also to do USB PD communication. Thus it would be great to enable support for it in the operating system. But the USB-PD specification requires, that a device reacts to USB-PD messages send by the power-supply within around 5 seconds. If that does not happen the power-supply assumes, that the device does not support USB-PD. If a device later starts sending USB-PD messages it is considered an error, which is solved by doing a hard reset. A USB-PD hard reset means, that all supply voltages are removed for a short period of time. For boards, which are solely powered through their USB-C port, like the Radxa Rock 5B, this results in an machine reset. This is currently worked around by not describing the FUSB302 in the kernel DT, so nothing will ever speak USB-PD on the Rock 5B. This means 1. the USB-C port cannot be used at all 2. the board will be running via fallback supply, which provides limited power capabilities In order to avoid the hard reset, this adds FUSB302 support to U-Boot, so that we react to the power-supply's queries in time. The code, which is originally from the Linux kernel, consists of two parts: 1. the tcpm state machine, which implements the Type C port manager state machine as described in the USB PD specification 2. the fusb302 driver, which knows about specific registers Especially the first part has been heavily modified compared to the kernel, which makes use of multiple delayed works and threads. For this I used a priorly ported version from Rockchip, removed their hacks and any states not necessary in U-Boot (e.g. audio accessory support). This version has been tested on Radxa Rock 5B using the open source TF-A (patches recently got merged into master branch) using the following power supplies: * non PD capable (reports 5V 0A) * RavPower 90W * UGREEN 100W * Anker 45W * RavPower PB Changes since PATCHv6: * Use devnum instead of devname as arg 'tcpm dev $arg', since devname is taken from the DT nodename and might not be unique * Collect Tested-by from Anand Moon * Collect Reviewed-by from Jonas Karlman * Rebase to latest master (no changes) Changes since PATCHv5: * Also avoid auto probing TCPM drivers when pd-disable property is set * Add Tested-by from Soeren Moch Changes since PATCHv4: * Rebase to latest master (v2024.10-rc4) * Fix regression introduced in PATCHv3: The exit code for fusb302_set_vconn() when vconn stays the same should be 0 instead of undefined * Fix regression introduced in PATCHv3: tcpm_set_polarity() needs to update port->polarity when there is no driver specific set_polarity function Changes since PATCHv3: * Rebase to latest master (57949a99b7bd) * Rework autoprobing; tcpm_post_bind tries to check if a probe is needed based on DT properties and then sets the DM_FLAG_PROBE_AFTER_BIND flag. If this accidently increases boot time on some boards they are probably missing a 'self-powered;' flag in their USB-C connector node. * Rock 5B ft_board_setup(): check for CONFIG_TYPEC_FUSB302 instead of CONFIG_MISC_INIT_R to reflect the above change * Drop adding 'CONFIG_MISC_INIT_R' to rock5b-rk3588_defconfig because of the reworked autoprobing * Log an error message if tcpm_send_queued_message() exits early * Add R-b for the rockchip specific changes from Kever Yang * Increase the timeout in tcpm_pd_transmit(), which seems to be the issue Sören Moch ran into. I could not really reproduce it. Please test if this helps with your supply (and share the logs if it does not help). I noticed this version has issues with an old PD capable powerbank I own. I'm still looking into that but wanted to share a new version so that the other changes can get reviewed. Changes since PATCHv2: * Rebase to latest master (a70d991212c9) * Drop Wang Jie from Cc, since his address bounces * I did not add a test suite. I fully agree, that it would be nice to have one, but it is also a lot of work. Just emulating a FUSB302 is not enough, we also need to emulate the remote USB-PD device to make this useful. Without that we would only test what happens when a non-responsive USB-PD supply is attached and that is the boring, very simple path in this code. On the other hand implementing an emulated USB-C PD remote side more or less requires implementing another big state machine. * Add documentation for the 'tcpm' command (Simon Glass) * I also got asked to add more documentation for the feature in general. I'm not really sure what is needed. At least Tim Harvey managed to use it considering he got stusb4500 working on top of PATCHV2. If there are more specific requests I can write something. * Just like PATCHv1, PATCHv2 received a 'Tested-by: Soeren Moch <smoch(a)web.de>', which I did not take over. This time the changes are a lot smaller, but the different handling of timeouts might have broken something. (On my end things still behave correctly of course, otherwise I wouldn't have sent this series) * Address feedback from Marek Vasut - TCPM core - drop useless "failure" function - replace printf with log in TCPM command code - invert some conditions to reduce indent - use read_poll_timeout() in tcpm_pd_transmit() - did not add any more 'static' keywords to functions, the non-static TCPM functions are exported and called from the fusb302 driver. - add a safety guard to tcpm_send_queued_message(), which stops the loop if more than 100 messages are send directly after each other. This should never happen anyways, but it's better to exit cleanly if the code runs astray. - FUSB302 driver - Drop default initialization for most local ret variables - Make some local variables constant - Make set_polarity callback optional on the uclass level and drop the empty FUSB302 implementation - Change buffer initialization in send message function - Create define for max. message length magic value - Rock 5B board code - Add comment why misc_init_r explicitly initializes PD - Split defconfig and DT into separate patches (Kever Yang) Changes since PATCHv1: * tcpm: split uclass specific code to tcpm-uclass * tcpm_print_info: move printing part to cmd/tcpm.c * tcpm_print_info: report more information - PD revision - Cable orientation - Power role - Data role - Print TCPM state based on connection status * tcpm: use "struct udevice *dev" instead of "struct tcpm_port *port" as function argument in most places and drop dev from the tcpm_port struct * tcpm: avoid useless kzalloc + copy + free for incoming events * tcpm: use dev_get_uclass_plat() for tcpm_port * tcpm: run tcpm_port_init() and tcpm_poll_event() from UCLASS post_probe() * tcpm/fusb302: get rid of tcpc_dev by using dm_tcpm_ops() for the function pointers and introducing get_connector_node() for the ofnode * fusb302: use "struct udevice *dev" instead of "struct fusb302_chip *chip" as function argument and drop dev from the fusb302_chip struct * fusb302: drop multiple unused members from fusb302_chip * fusb302: directly use udelay instead of usleep_range define * fusb302: use fusb302_ prefix for all functions. Afterwards tcpm_ prefix is only used for the tcpm code itself * fusb302: move fusb302_poll_event() to avoid forward defintion * fusb302: drop probe function * fusb302: drop unused LOG_BUFFER defines * roughly 20% of all lines of the series changed between v1 and v2, so I did not collect the Tested-by from Soeren Moch Greetings, -- Sebastian Sebastian Reichel (6): usb: tcpm: add core framework usb: tcpm: fusb302: add driver board: rock5b-rk3588: enable USB-C in operating system rockchip: rk3588-rock-5b: Add USB-C controller to u-boot.dtsi rockchip: rock5b-rk3588: Enable USB-C PD support MAINTAINERS: add TCPM section MAINTAINERS | 9 + Makefile | 1 + arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 28 + board/radxa/rock5b-rk3588/Makefile | 6 + board/radxa/rock5b-rk3588/rock5b-rk3588.c | 16 + cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/tcpm.c | 136 ++ configs/rock5b-rk3588_defconfig | 4 + doc/usage/cmd/tcpm.rst | 66 + doc/usage/index.rst | 1 + drivers/usb/Kconfig | 2 + drivers/usb/tcpm/Kconfig | 16 + drivers/usb/tcpm/Makefile | 4 + drivers/usb/tcpm/fusb302.c | 1323 ++++++++++++ drivers/usb/tcpm/fusb302_reg.h | 177 ++ drivers/usb/tcpm/tcpm-internal.h | 173 ++ drivers/usb/tcpm/tcpm-uclass.c | 149 ++ drivers/usb/tcpm/tcpm.c | 2288 +++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/usb/pd.h | 516 +++++ include/usb/tcpm.h | 99 + 22 files changed, 5023 insertions(+) create mode 100644 board/radxa/rock5b-rk3588/Makefile create mode 100644 board/radxa/rock5b-rk3588/rock5b-rk3588.c create mode 100644 cmd/tcpm.c create mode 100644 doc/usage/cmd/tcpm.rst create mode 100644 drivers/usb/tcpm/Kconfig create mode 100644 drivers/usb/tcpm/Makefile create mode 100644 drivers/usb/tcpm/fusb302.c create mode 100644 drivers/usb/tcpm/fusb302_reg.h create mode 100644 drivers/usb/tcpm/tcpm-internal.h create mode 100644 drivers/usb/tcpm/tcpm-uclass.c create mode 100644 drivers/usb/tcpm/tcpm.c create mode 100644 include/usb/pd.h create mode 100644 include/usb/tcpm.h -- 2.45.2

2 8

[PATCH v3 1/2] dts: Add ability to build fallback DTBOs from arch/$(ARCH)/dts
by Marek Vasut 17 Oct '24

17 Oct '24

Currently the enablement of OF_UPSTREAM results on the build system searching for DTs only in dts/upstream/ . There are platforms which use U-Boot specific DTBOs applied on top of U-Boot control DT during SPL stage, and source DTs for these are located in arch/$(ARCH)/dtb. Add dedicated 'dtbos' target which builds only .dtbos and not .dtbs and in case CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS is enabled, build this target for arch/$(ARCH)/dtb to generate local U-Boot specific DTBOs. Adjust top level Makefile so binman would search for .dtb and .dtbo in both OF_UPSTREAM specific paths and arch/$(ARCH)/dtb for the .dtbo case in case CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS is enabled. Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Caleb Connolly <caleb.connolly(a)linaro.org> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Lothar Rubusch <l.rubusch(a)gmail.com> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- V2: Gate this functionality behind CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS V3: - Unnest CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS - Add RB from from Sumit --- NOTE: Depends on https://lore.kernel.org/u-boot/20241004001118.322531-1-marex@denx.de/ --- Makefile | 4 ++++ dts/Kconfig | 16 ++++++++++++++++ dts/Makefile | 14 +++++++++++++- scripts/Makefile.dts | 6 ++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af24de4165e..a5258e8cb3f 100644 --- a/Makefile +++ b/Makefile @@ -1375,7 +1375,11 @@ of_list := "$(ext_dtb_list)" of_list_dirs := $(dir $(EXT_DTB)) else of_list := $(CONFIG_OF_LIST) +ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),) +of_list_dirs := $(dt_dir) arch/$(ARCH)/dts +else of_list_dirs := $(dt_dir) +endif default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) endif diff --git a/dts/Kconfig b/dts/Kconfig index 569d4be338e..385058b429f 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -125,6 +125,22 @@ config OF_UPSTREAM_VENDOR help Select the vendor to build all devicetree files for. +config OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS + bool "Build local DTBOs as fallback for DTBOs missing upstream" + default n + depends on OF_UPSTREAM + help + Enable building DTBOs from arch/$(ARCH)/dts as a fallback for + DTBOs which are not part of Linux kernel upstream yet. This is + a stopgap measure to expedite OF_UPSTREAM switch for platforms + which already have main DT in Linux kernel upstream, but still + have leftover DTBOs in U-Boot tree. + + Do not use this option, upstream your DTs and DTBOs instead. + If the upstreaming is in progress, use with utmost caution. + + If unsure, say N. + choice prompt "Provider of DTB for DT control" depends on OF_CONTROL diff --git a/dts/Makefile b/dts/Makefile index d6c2c9daf31..a879fb4e9e9 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -20,6 +20,12 @@ else dt_dir := arch/$(ARCH)/dts endif +ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),) +local_dtbos := local-dtbos +else +local_dtbos := +endif + ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else @@ -40,7 +46,7 @@ endif targets += dt.dtb -$(DTB): arch-dtbs +$(DTB): arch-dtbs $(local_dtbos) $(Q)test -e $@ || ( \ echo >&2; \ echo >&2 "Device Tree Source ($@) is not correctly specified."; \ @@ -53,6 +59,12 @@ PHONY += arch-dtbs arch-dtbs: $(Q)$(MAKE) $(build)=$(dt_dir) dtbs +ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),) +PHONY += local-dtbos +local-dtbos: + $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbos +endif + ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o # support "out-of-tree" build for dtb-spl diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts index 1fe142f2bbf..3ab67b3c247 100644 --- a/scripts/Makefile.dts +++ b/scripts/Makefile.dts @@ -21,4 +21,10 @@ PHONY += dtbs dtbs: $(addprefix $(obj)/, $(dtb-y)) @: +ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),) +PHONY += dtbos +dtbos: $(addprefix $(obj)/, $(filter-out %.dtb,$(dtb-y))) + @: +endif + clean-files := *.dtb *.dtbo */*.dtb */*.dtbo *_HS -- 2.45.2

2 8

[PATCH] ARM: stm32: Add script to install U-Boot from SD/eMMC to SPI NOR on DH STM32MP15xx DHSOM
by Marek Vasut 17 Oct '24

17 Oct '24

Make the dh_update_sd_to_sf script generic, rename it to dh_update_sdmmc_to_sf and implement two specific dh_update_sd_to_sf and dh_update_emmc_to_sf scripts which load U-Boot from either SD or eMMC and install it into SPI NOR. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- include/configs/stm32mp15_dh_dhsom.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index de39b19219d..fa759c938b3 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -38,16 +38,26 @@ "setenv loadaddr1 && " \ "setenv sblkcnt && " \ "setenv ublkcnt\0" \ - "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ + "dh_update_sdmmc_to_sf=" /* Erase SPI NOR and install U-Boot from SD/eMMC */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ - "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \ + "load ${dh_update_iface} ${dh_update_dev} " \ + "${loadaddr1} /boot/u-boot-spl.stm32 && " \ "env set filesize1 ${filesize} && " \ - "load mmc 0:4 ${loadaddr} /boot/u-boot.itb && " \ + "load ${dh_update_iface} ${dh_update_dev} " \ + "${loadaddr} /boot/u-boot.itb && " \ "sf probe && sf erase 0 0x200000 && " \ "sf update ${loadaddr1} 0 ${filesize1} && " \ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \ "env set filesize1 && env set loadaddr1\0" \ + "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ + "setenv dh_update_iface mmc && " \ + "setenv dh_update_dev 0:4 && " \ + "run dh_update_sdmmc_to_sf\0" \ + "dh_update_emmc_to_sf=" /* Erase SPI NOR and install U-Boot from eMMC */ \ + "setenv dh_update_iface mmc && " \ + "setenv dh_update_dev 1:4 && " \ + "run dh_update_sdmmc_to_sf\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ -- 2.45.2

2 4

[PATCH] pico-imx7d: increase ODT resistor value from 60 to 120 ohm to improve DRAM stability
by egyszeregy＠freemail.hu 16 Oct '24

16 Oct '24

From: Ray Chang <ray.chang(a)technexion.com> Signed-off-by: Ray Chang <ray.chang(a)technexion.com> --- board/technexion/pico-imx7d/spl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c index cb60d3be42..fc97c58ae1 100644 --- a/board/technexion/pico-imx7d/spl.c +++ b/board/technexion/pico-imx7d/spl.c @@ -89,11 +89,11 @@ static struct ddr_phy ddr_phy_regs_val = { static struct mx7_calibration calib_param = { .num_val = 5, .values = { - 0x0E407304, - 0x0E447304, - 0x0E447306, - 0x0E447304, - 0x0E447304, + 0x0E207304, + 0x0E247304, + 0x0E247306, + 0x0E247304, + 0x0E207304, }, }; -- 2.47.0.windows.1

3 3

[PATCH v2] cmd: setexpr: fix no matching string in gsub return empty value
by Massimiliano Minella 16 Oct '24

16 Oct '24

From: Massimiliano Minella <massimiliano.minella(a)se.com> In gsub, when the destination string is empty, the string 't' is provided and the regular expression doesn't match, then the final result is an empty string. Example: => echo ${foo} => setenv foo => setexpr foo gsub e a bar => echo ${foo} => The variable ${foo} should contain "bar" and the lack of match shouldn't be considered an error. This patch fixes the erroneous behavior by removing the return statement and breaking out of the loop in case of lack of match. Also add a test for the no match case. Signed-off-by: Massimiliano Minella <massimiliano.minella(a)se.com> --- Changes in V2: - update documentation to describe the behavior cmd/setexpr.c | 9 ++++----- doc/usage/cmd/setexpr.rst | 1 + test/cmd/setexpr.c | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cmd/setexpr.c b/cmd/setexpr.c index 233471f6cb..ab76824a32 100644 --- a/cmd/setexpr.c +++ b/cmd/setexpr.c @@ -216,14 +216,12 @@ int setexpr_regex_sub(char *data, uint data_size, char *nbuf, uint nbuf_size, if (res == 0) { if (loop == 0) { debug("%s: No match\n", data); - return 1; } else { - break; + debug("## MATCH ## %s\n", data); } + break; } - debug("## MATCH ## %s\n", data); - if (!s) return 1; @@ -540,7 +538,8 @@ U_BOOT_CMD( " - For each substring matching the regular expression <r> in the\n" " string <t>, substitute the string <s>. The result is\n" " assigned to <name>. If <t> is not supplied, use the old\n" - " value of <name>\n" + " value of <name>. If no substring matching <r> is found in <t>,\n" + " assign <t> to <name>.\n" "setexpr name sub r s [t]\n" " - Just like gsub(), but replace only the first matching substring" #endif diff --git a/doc/usage/cmd/setexpr.rst b/doc/usage/cmd/setexpr.rst index d245a13ca8..593a0ea91e 100644 --- a/doc/usage/cmd/setexpr.rst +++ b/doc/usage/cmd/setexpr.rst @@ -39,6 +39,7 @@ setexpr name gsub <r> <s> [<t>] string <t>, substitute the string <s>. The result is assigned to <name>. If <t> is not supplied, use the old value of <name>. + If no substring matching <r> is found in <t>, assign <t> to <name>. setexpr name sub <r> <s> [<t>] Just like gsub(), but replace only the first matching substring diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index 312593e1e3..ee329e94b8 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -179,6 +179,16 @@ static int setexpr_test_regex(struct unit_test_state *uts) val = env_get("mary"); ut_asserteq_str("this is a test", val); + /* No match */ + ut_assertok(run_command("setenv fred 'this is a test'", 0)); + ut_assertok(run_command("setenv mary ''", 0)); + ut_assertok(run_command("setexpr fred gsub us is \"${fred}\"", 0)); + ut_assertok(run_command("setexpr mary gsub us is \"${fred}\"", 0)); + val = env_get("fred"); + ut_asserteq_str("this is a test", val); + val = env_get("mary"); + ut_asserteq_str("this is a test", val); + unmap_sysmem(buf); return 0; -- 2.43.0

4 6

[PATCH 0/4] stm32mp: fix boot issue with OP-TEE
by Patrick Delaunay 16 Oct '24

16 Oct '24

The series fix several issues for STM32MP15 boot with OP-TEE (data abort and ETZPC firewall exception) and regressions for STM32MP25 support. Patrick Delaunay (4): stm32mp: compute ram_top based on the optee base address only for STM32MP1 ARM: stm32mp: enable data cache after LMB configuration for STM32MP1 doc: clarify scmi device tree for stm32mp15 boards stm32mp: fix name of optee reserved memory node arch/arm/mach-stm32mp/Kconfig | 2 ++ arch/arm/mach-stm32mp/dram_init.c | 19 ++++++++++++++----- arch/arm/mach-stm32mp/stm32mp1/cpu.c | 7 +++++++ doc/board/st/stm32mp1.rst | 25 ++++++++++++++++++++++--- 4 files changed, 45 insertions(+), 8 deletions(-) -- 2.25.1

2 8