July 2023 - U-Boot

[PATCH v2 1/1] doc: update doc/sphinx/requirements.txt
by Heinrich Schuchardt 28 Jul '23

28 Jul '23

Update the following requirements to their latest version: * Pygments - syntax highlighting * pytz - world timezone definitions * certifi - Mozilla's CA bundle Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: fix typo in title --- doc/sphinx/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt index aed4492117..b74661ad3f 100644 --- a/doc/sphinx/requirements.txt +++ b/doc/sphinx/requirements.txt @@ -1,6 +1,6 @@ alabaster==0.7.12 Babel==2.9.1 -certifi==2022.12.7 +certifi==2023.5.7 charset-normalizer==2.0.12 docutils==0.16 idna==3.3 @@ -8,9 +8,9 @@ imagesize==1.3.0 Jinja2==3.0.3 MarkupSafe==2.1.1 packaging==21.3 -Pygments==2.11.2 +Pygments==2.15.1 pyparsing==3.0.7 -pytz==2022.1 +pytz==2023.3 requests==2.31.0 six==1.16.0 snowballstemmer==2.2.0 -- 2.40.1

2 1

Pull request for efi-2023-10-rc2
by Heinrich Schuchardt 28 Jul '23

28 Jul '23

Dear Tom, The following changes since commit c98c401dfb485b39c7453a4147b17cd4b8d10c67: Merge https://source.denx.de/u-boot/custodians/u-boot-usb (2023-07-27 10:35:36 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-10-rc2 for you to fetch changes up to 6e8fa0611f19824e200fe4725f18bce7e2000071: board: ti: k3: Convert boot flow ascii flow to svg (2023-07-28 11:36:38 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/17105 @Nishanth Please, add SPDX headers to the SVG files in a follow up patch. ---------------------------------------------------------------- Pull request for efi-2023-10-rc2 Documentation: * Update the documentation for TI K3 boards (use SVG images) * Update doc/sphinx/requirements.txt * Describe QEMU emulation of block devices UEFI * Fix device paths for special block devices ---------------------------------------------------------------- Dan Carpenter (1): efi_loader: fix uninitialized variable bug in efi_set_load_options() Heinrich Schuchardt (5): doc: update doc/sphinx/requirements.txt efi_loader: device paths for special block devices efi_loader: simplify dp_fill() doc: fix typo device_compat/.h doc: describe QEMU emulation of block devices Ilias Apalodimas (1): efi_loader: make efi_delete_handle() follow the EFI spec Nishanth Menon (19): doc: board: ti: Optimize sources references doc: board: ti: am62x/j7200: Update with common boot flow diagram doc: board: ti: am65x: Update with boot flow diagram doc: board: ti: j721e: Update with boot flow diagram doc: board: ti: k3: Reuse build instructions doc: board: ti: j7200: Convert the image format to svg doc: board: ti: j721e: Convert the image format to svg doc: board: ti: am65x: Convert the image format to svg doc: board: ti: am62x: Convert the image format to svg doc: board: ti: am62x_sk: Add labels to reuse memory map doc: board: ti: am62x_sk: Convert switch settings to list tables doc: board: ti: j7200_evm: Convert switch settings to list tables doc: board: ti: am65x_evm: Convert the UART boot responsibility to list table doc: board: ti: am65/j721e: Convert OSPI memory map to svg doc: board: ti: am65x_evm: Convert the emmc layout to svg doc: board: ti: j7200_evm: Convert the emmc layout to svg doc: board: ti: *: Add platform information doc: board: ti: k3: Sort the boards in alphabetical order board: ti: k3: Convert boot flow ascii flow to svg Tom Rini (1): doc: ti: Clarify required file names for K3 platforms cmd/bootefi.c | 21 +- doc/board/emulation/blkdev.rst | 38 + doc/board/emulation/index.rst | 4 +- doc/board/ti/am62x_sk.rst | 246 +-- doc/board/ti/am65x_evm.rst | 301 +--- doc/board/ti/img/boot_diagram_am65.svg | 1779 +++++++++++++++++++++ doc/board/ti/img/boot_diagram_j721e.svg | 2012 ++++++++++++++++++++++++ doc/board/ti/img/boot_diagram_k3_current.svg | 1925 +++++++++++++++++++++++ doc/board/ti/img/boot_flow_01.svg | 220 +++ doc/board/ti/img/boot_flow_02.svg | 459 ++++++ doc/board/ti/img/boot_flow_03.svg | 583 +++++++ doc/board/ti/img/dm_tispl.bin.svg | 317 ++++ doc/board/ti/img/emmc_am65x_evm_boot0.svg | 748 +++++++++ doc/board/ti/img/emmc_j7200_evm_boot01.svg | 662 ++++++++ doc/board/ti/img/emmc_j7200_evm_udafs.svg | 505 ++++++ doc/board/ti/img/j7200_tiboot3.bin.svg | 447 ++++++ doc/board/ti/img/multi_cert_tiboot3.bin.svg | 287 ++++ doc/board/ti/img/no_multi_cert_tiboot3.bin.svg | 238 +++ doc/board/ti/img/nodm_tispl.bin.svg | 277 ++++ doc/board/ti/img/ospi_sysfw.svg | 721 +++++++++ doc/board/ti/img/sysfw.itb.svg | 317 ++++ doc/board/ti/j7200_evm.rst | 301 +--- doc/board/ti/j721e_evm.rst | 271 +--- doc/board/ti/k3.rst | 136 +- doc/develop/codingstyle.rst | 2 +- doc/sphinx/requirements.txt | 6 +- include/efi_loader.h | 2 +- lib/efi_driver/efi_uclass.c | 12 +- lib/efi_loader/efi_boottime.c | 20 +- lib/efi_loader/efi_device_path.c | 155 +- lib/efi_loader/efi_disk.c | 7 +- lib/efi_loader/efi_load_options.c | 2 +- 32 files changed, 12019 insertions(+), 1002 deletions(-) create mode 100644 doc/board/emulation/blkdev.rst create mode 100644 doc/board/ti/img/boot_diagram_am65.svg create mode 100644 doc/board/ti/img/boot_diagram_j721e.svg create mode 100644 doc/board/ti/img/boot_diagram_k3_current.svg create mode 100644 doc/board/ti/img/boot_flow_01.svg create mode 100644 doc/board/ti/img/boot_flow_02.svg create mode 100644 doc/board/ti/img/boot_flow_03.svg create mode 100644 doc/board/ti/img/dm_tispl.bin.svg create mode 100644 doc/board/ti/img/emmc_am65x_evm_boot0.svg create mode 100644 doc/board/ti/img/emmc_j7200_evm_boot01.svg create mode 100644 doc/board/ti/img/emmc_j7200_evm_udafs.svg create mode 100644 doc/board/ti/img/j7200_tiboot3.bin.svg create mode 100644 doc/board/ti/img/multi_cert_tiboot3.bin.svg create mode 100644 doc/board/ti/img/no_multi_cert_tiboot3.bin.svg create mode 100644 doc/board/ti/img/nodm_tispl.bin.svg create mode 100644 doc/board/ti/img/ospi_sysfw.svg create mode 100644 doc/board/ti/img/sysfw.itb.svg

2 1

[PATCH V3 0/3] arm: dts: Sync k3-am62 with upstream kernel
by Nishanth Menon 28 Jul '23

28 Jul '23

Hopefully, third time is a charm.. ;) I have picked up part of Sjoerd's series[1] to keep it constrained just to dts sync at this point rather than adding newer functionality on top. You can find the full series in [2]. Attempting am625 as a start of a series of clean ups for device tree for u-boot, but will love to get any review comments to improve this series up. This series also depends on: https://lore.kernel.org/r/20230724-ti-mdio-pinmux-v4-1-18541f976501@kernel.… https://lore.kernel.org/r/20230722193151.117345-2-rogerq@kernel.org https://lore.kernel.org/r/20230722193151.117345-3-rogerq@kernel.org baseline: master 197aa22e6506 Merge branch 'master' of git://git.denx.de/u-boot-coldfire Boot log: https://gist.github.com/nmenon/a1705c385189c2367d8cad1debcf8155 changes since v2: * Typo fixups in commit messages - patches 1 and 3 * Picked up Roger's Reviewed-by V2: https://lore.kernel.org/all/20230726151027.2517151-1-nm@ti.com/ Changes since V1: * Added dependency on CPSW cleanup patches. * Dropped the hack done in u-boot.dtsi to use kernel dts as is for cpsw V1: https://lore.kernel.org/all/20230725125856.1807742-1-nm@ti.com/ Changes since RFC: * dependencies are all merged on master now. * No new dependencies in this series, though the issue with uboot dtb not working for kernel is not a regression, it should probably be handled as a fixup part of RC Cycle. RFC: https://lore.kernel.org/u-boot/20230713072019.3153871-1-nm@ti.com/ Nishanth Menon (1): arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1 Sjoerd Simons (2): omap: timer: add ti,am654-timer compatibility arm: mach-k3: am62: Add timer0 id to the dev list arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- arch/arm/dts/k3-am62.dtsi | 11 +- arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 33 +-- arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- arch/arm/dts/k3-am625.dtsi | 54 +++- arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ arch/arm/dts/k3-pinctrl.h | 53 ++++ arch/arm/mach-k3/am62x/dev-data.c | 1 + drivers/timer/omap-timer.c | 1 + 13 files changed, 1066 insertions(+), 398 deletions(-) create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi create mode 100644 arch/arm/dts/k3-pinctrl.h [1] https://lore.kernel.org/all/20230406185542.1179073-1-sjoerd@collabora.com/ [2] https://github.com/nmenon/fix-k3-dt-u-boot/commits/fdt-fixup-s1-am625-rev4 -- 2.40.0

3 8

[PATCH 0/5] iot2050: 2023.10-rc1 fixes and cleanups
by Jan Kiszka 28 Jul '23

28 Jul '23

[resent, now that the list is working again] Most of this comes late, but primarily as the required binman templating changes were awaited, and the lots of regressions hit this board. I really hope we can not only merge the minimally required patch 1 of this series. Jan CC: Andrew Davis <afd(a)ti.com> CC: Manorit Chawdhry <m-chawdhry(a)ti.com> CC: Simon Glass <sjg(a)chromium.org> Jan Kiszka (5): boards: siemens: iot2050: Fix boot configuration iot2050: Use binman in signing script boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again doc: board: siemens: iot2050: Update build env vars configs: iot2050: Enabled keyed autoboot arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 155 +++++++++++------- board/siemens/iot2050/Kconfig | 30 +--- board/siemens/iot2050/MAINTAINERS | 3 +- board/siemens/iot2050/board.c | 25 ++- board/siemens/iot2050/iot2050.env | 2 + ...ot2050_pg1_defconfig => iot2050_defconfig} | 8 +- configs/iot2050_pg2_defconfig | 150 ----------------- doc/board/siemens/iot2050.rst | 31 ++-- include/configs/iot2050.h | 11 ++ tools/iot2050-sign-fw.sh | 11 +- 10 files changed, 158 insertions(+), 268 deletions(-) rename configs/{iot2050_pg1_defconfig => iot2050_defconfig} (94%) delete mode 100644 configs/iot2050_pg2_defconfig -- 2.35.3

3 11

[PATCH v1] arm: k3: fix fdt_del_node_path implicit declaration and a missing include
by Emanuele Ghidoli 28 Jul '23

28 Jul '23

From: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> Fix missing declaration of fdt_del_node_path() while compiling am625_fdt.c and missing common_fdt.h include in common_fdt.c Fixes: 70aa5a94d451 ("arm: mach-k3: am62: Fixup CPU core, gpu and pru nodes in fdt") Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> --- arch/arm/mach-k3/common_fdt.c | 1 + arch/arm/mach-k3/common_fdt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/mach-k3/common_fdt.c b/arch/arm/mach-k3/common_fdt.c index 9478f605441f..645c4de42f70 100644 --- a/arch/arm/mach-k3/common_fdt.c +++ b/arch/arm/mach-k3/common_fdt.c @@ -7,6 +7,7 @@ #include <dm.h> #include <fdt_support.h> #include <linux/soc/ti/ti_sci_protocol.h> +#include "common_fdt.h" static int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name) { diff --git a/arch/arm/mach-k3/common_fdt.h b/arch/arm/mach-k3/common_fdt.h index 46c3dc5e1197..4d23ae638ca6 100644 --- a/arch/arm/mach-k3/common_fdt.h +++ b/arch/arm/mach-k3/common_fdt.h @@ -7,5 +7,6 @@ #define _COMMON_FDT_H int fdt_fixup_msmc_ram_k3(void *blob); +int fdt_del_node_path(void *blob, const char *path); #endif /* _COMMON_FDT_H */ -- 2.34.1

2 1

[PATCH v2 1/2] configs: keystone2: Unwind KERNEL_MTD_PARTS definition
by Andrew Davis 28 Jul '23

28 Jul '23

This is more complex than it needs to be and makes converting these boards over to plain text env files more difficult. Remove setting mtdparts as the DTS already contain the partitions. While here also drop the conflicting definitions from the K2 defconfigs. Signed-off-by: Andrew Davis <afd(a)ti.com> --- Changes for v2: - Remove mtdparts completely for K2 configs/k2e_evm_defconfig | 1 - configs/k2e_hs_evm_defconfig | 1 - configs/k2g_evm_defconfig | 1 - configs/k2g_hs_evm_defconfig | 1 - configs/k2hk_evm_defconfig | 1 - configs/k2hk_hs_evm_defconfig | 1 - configs/k2l_evm_defconfig | 1 - configs/k2l_hs_evm_defconfig | 1 - include/configs/k2e_evm.h | 4 ---- include/configs/k2g_evm.h | 3 --- include/configs/k2hk_evm.h | 4 ---- include/configs/k2l_evm.h | 4 ---- include/configs/ti_armv7_keystone2.h | 7 +------ include/environment/ti/spi.h | 14 -------------- 14 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 include/environment/ti/spi.h diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 6d9d82594e1..44bed00ec97 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index c782bf11830..55c0182f874 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 756e7502a19..45c7fade320 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -56,7 +56,6 @@ CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index f0de3232e9d..54a980cab54 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_REMOTEPROC=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice" diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 74ef0668d86..a2651780484 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 5bd8c28f546..8c0472dcc2b 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 378a71f94e1..55ddd3cce96 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -58,7 +58,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 31ec3029d76..ce7aa3a39ef 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 630dfdc5b7f..604b85084ca 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2E_EVM_H #define __CONFIG_K2E_EVM_H -#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -27,8 +25,6 @@ #include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 9 diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d0634a99f49..186145edc4c 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -10,7 +10,6 @@ #define __CONFIG_K2G_EVM_H #include <environment/ti/mmc.h> -#include <environment/ti/spi.h> /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ @@ -54,8 +53,6 @@ #define CFG_KSNET_CPSW_NUM_PORTS 2 #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ -#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS - #include <configs/ti_armv7_keystone2.h> #endif /* __CONFIG_K2G_EVM_H */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index ed54be839ff..44a47995b73 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2HK_EVM_H #define __CONFIG_K2HK_EVM_H -#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -27,8 +25,6 @@ #include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5 diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 69d42eaf9f1..43d4049cd9c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_K2L_EVM_H #define __CONFIG_K2L_EVM_H -#include <environment/ti/spi.h> - /* U-Boot general configuration */ #define ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ @@ -27,8 +25,6 @@ #include <configs/ti_armv7_keystone2.h> -#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS - /* Network */ #define CFG_KSNET_CPSW_NUM_PORTS 5 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a47f0902a26..586ccaacd3f 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -78,10 +78,6 @@ /* EDMA3 */ -#define KERNEL_MTD_PARTS \ - "mtdparts=" \ - SPI_MTD_PARTS - #define DEFAULT_FW_INITRAMFS_BOOT_ENV \ "name_fw_rd=k2-fw-initrd.cpio.gz\0" \ "set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0" \ @@ -148,8 +144,7 @@ "sf write ${loadaddr} 0 ${filesize}\0" \ "burn_uboot_nand=nand erase 0 0x100000; " \ "nand write ${loadaddr} 0 ${filesize}\0" \ - "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ - KERNEL_MTD_PARTS \ + "args_all=setenv bootargs console=ttyS0,115200n8 rootwait\0" \ "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ "${nfs_options} ip=dhcp\0" \ diff --git a/include/environment/ti/spi.h b/include/environment/ti/spi.h deleted file mode 100644 index 1681dc8635e..00000000000 --- a/include/environment/ti/spi.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com - * - * Environment variable definitions for SPI on TI boards. - */ - -#ifndef __TI_SPI_H -#define __TI_SPI_H - -#define KEYSTONE_SPI0_MTD_PARTS "spi0.0:1m(u-boot-spl)ro,-(misc);\0" -#define KEYSTONE_SPI1_MTD_PARTS "spi1.0:1m(u-boot-spl)ro,-(misc);\0" - -#endif -- 2.39.2

2 5

[PATCH 0/5] K3 incremental fixes
by Manorit Chawdhry 28 Jul '23

28 Jul '23

The series addresses the previous review comments in an incremental manner [0]. Only the important and core ones are addressed currently and the furthur fixes will be sent accordingly after their development is done.. [0]: https://lore.kernel.org/u-boot/20230713-b4-upstream-fit-image-support-v1-0-… Signed-off-by: Manorit Chawdhry <m-chawdhry(a)ti.com> --- Manorit Chawdhry (3): configs: am62x: add SPL_MAX_SIZE back configs: am64x_evm_a53_defconfig: remove SYS_SPI_U_BOOT_OFFS mach-k3: security: improve the checks around authentication Vignesh Raghavendra (2): env: ti: mmc.env: Move mmc related args to common place env: ti: mmc.env: Fix overlays directory path arch/arm/mach-k3/security.c | 20 +++++++++----------- board/ti/am62x/am62x.env | 14 -------------- board/ti/am64x/am64x.env | 14 -------------- board/ti/am65x/am65x.env | 14 -------------- board/ti/j721e/j721e.env | 15 --------------- board/ti/j721s2/j721s2.env | 17 ----------------- configs/am62x_evm_a53_defconfig | 1 + configs/am64x_evm_a53_defconfig | 1 - include/environment/ti/mmc.env | 14 ++++++++++++++ 9 files changed, 24 insertions(+), 86 deletions(-) --- base-commit: 94e7cb181ad6bd25d36a11c58e0df64e9f815888 change-id: 20230725-b4-upstream-k3-fixes-383c756de738 Best regards, -- Manorit Chawdhry <m-chawdhry(a)ti.com>

3 13

[PATCH v2 0/4] net: ti: am65-cpsw-nuss: Drop custom properties
by Roger Quadros 28 Jul '23

28 Jul '23

Hi, This series gets rid of 2 custom properties (mac_efuse and cpsw-phy-sel) that were used in u-boot for the cpsw3g node. This makes it easier for us to have u-boot DT in sync with Linux. Last 2 patches are RFC so they can come separately. i.e. squashed with DT cleanup series from Nishanth. cheers, -roger Changelog: v2: - drop enabling CONFIG_SYSCON from defconfig. Use imply in Kconfig instead. - add patch to drop cpsw-phy-sel custom DT property. Roger Quadros (4): net: ti: am65-cpsw-nuss: Use approved property to get efuse address net: ti: am65-cpsw-nuss: Get port mode register from standard "phys" property arm: dts: k3-am625-sk-u-boot.dtsi: drop mac_efuse arm: dts: k3-am625-sk-u-boot.dtsi: drop cpsw-phy-sel property arch/arm/dts/k3-am625-sk-u-boot.dtsi | 10 --- drivers/net/ti/Kconfig | 1 + drivers/net/ti/am65-cpsw-nuss.c | 115 +++++++++++++++++---------- 3 files changed, 74 insertions(+), 52 deletions(-) -- 2.34.1

5 10

[PATCH 1/1] doc: U-Boot boot phases
by Heinrich Schuchardt 28 Jul '23

28 Jul '23

Add more detail to the description of U-Boot boot phases: * describe which steps are optional * mentions alternative boot flows Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/develop/spl.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/develop/spl.rst b/doc/develop/spl.rst index a1515a7b43..5743bdf37c 100644 --- a/doc/develop/spl.rst +++ b/doc/develop/spl.rst @@ -77,10 +77,11 @@ To check whether a feature is enabled, use CONFIG_IS_ENABLED():: This checks CONFIG_CLK for the main build, CONFIG_SPL_CLK for the SPL build, CONFIG_TPL_CLK for the TPL build, etc. -U-Boot Phases -------------- +U-Boot Boot Phases +------------------ -U-Boot boots through the following phases: +U-Boot goes through the following boot phases where TPL, VPL, SPL are optional. +While many boards use SPL less use TPL. TPL Very early init, as tiny as possible. This loads SPL (or VPL if enabled). @@ -97,6 +98,12 @@ SPL U-Boot U-Boot proper, containing the command line and boot logic. +Further usages of U-Boot SPL comprise: + +* Launching BL31 of ARM Trusted Firmware which invokes main U-Boot as BL33 +* launching EDK II +* launching Linux kernel +* launching RISC-V OpenSBI which invokes main U-Boot Checking the boot phase ----------------------- -- 2.40.1

3 2

[PATCH] gpio: Use separate bitfield array to indicate GPIO is claimed
by Marek Vasut 28 Jul '23

28 Jul '23

The current gpio-uclass design uses name field in struct gpio_dev_priv as an indicator that GPIO is claimed by consumer. This overloads the function of name field and does not work well for named pins not configured as GPIO pins. Introduce separate bitfield array as the claim indicator. This unbreaks dual-purpose AF and GPIO operation on STM32MP since commit 2c38f7c31806 ("pinctrl: pinctrl_stm32: Populate uc_priv->name[] with pinmux node's name") where any pin which has already been configured as AF could no longer be claimed as dual-purpose GPIO. This is important for pins like STM32 MMCI st,cmd-gpios . Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Michal Suchanek <msuchanek(a)suse.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Samuel Holland <samuel(a)sholland.org> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/gpio/gpio-uclass.c | 35 ++++++++++++++++++++++++++++++----- include/asm-generic/gpio.h | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 712119c3415..25873f07bd4 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -75,6 +75,20 @@ static int gpio_to_device(unsigned int gpio, struct gpio_desc *desc) return -ENOENT; } +/** + * gpio_is_claimed() - Test whether GPIO is claimed by consumer + * + * Test whether GPIO is claimed by consumer already. + * + * @uc_priv: gpio_dev_priv pointer. + * @offset: gpio offset within the device + * @return: true if claimed, false if not claimed + */ +static bool gpio_is_claimed(struct gpio_dev_priv *uc_priv, unsigned int offset) +{ + return !!(uc_priv->claimed[offset / 32] & BIT(offset % 32)); +} + #if CONFIG_IS_ENABLED(DM_GPIO_LOOKUP_LABEL) /** * dm_gpio_lookup_label() - look for name in gpio device @@ -94,7 +108,7 @@ static int dm_gpio_lookup_label(const char *name, *offset = -1; for (i = 0; i < uc_priv->gpio_count; i++) { - if (!uc_priv->name[i]) + if (!gpio_is_claimed(uc_priv, i)) continue; if (!strcmp(name, uc_priv->name[i])) { *offset = i; @@ -350,7 +364,7 @@ int dm_gpio_request(struct gpio_desc *desc, const char *label) int ret; uc_priv = dev_get_uclass_priv(dev); - if (uc_priv->name[desc->offset]) + if (gpio_is_claimed(uc_priv, desc->offset)) return -EBUSY; str = strdup(label); if (!str) @@ -362,6 +376,8 @@ int dm_gpio_request(struct gpio_desc *desc, const char *label) return ret; } } + + uc_priv->claimed[desc->offset / 32] |= BIT(desc->offset % 32); uc_priv->name[desc->offset] = str; return 0; @@ -438,7 +454,7 @@ int _dm_gpio_free(struct udevice *dev, uint offset) int ret; uc_priv = dev_get_uclass_priv(dev); - if (!uc_priv->name[offset]) + if (!gpio_is_claimed(uc_priv, offset)) return -ENXIO; if (ops->rfree) { ret = ops->rfree(dev, offset); @@ -446,6 +462,7 @@ int _dm_gpio_free(struct udevice *dev, uint offset) return ret; } + uc_priv->claimed[offset / 32] &= ~BIT(offset % 32); free(uc_priv->name[offset]); uc_priv->name[offset] = NULL; @@ -480,7 +497,7 @@ static int check_reserved(const struct gpio_desc *desc, const char *func) return -ENOENT; uc_priv = dev_get_uclass_priv(desc->dev); - if (!uc_priv->name[desc->offset]) { + if (!gpio_is_claimed(uc_priv, desc->offset)) { printf("%s: %s: error: gpio %s%d not reserved\n", desc->dev->name, func, uc_priv->bank_name ? uc_priv->bank_name : "", @@ -826,7 +843,7 @@ static int get_function(struct udevice *dev, int offset, bool skip_unused, return -EINVAL; if (namep) *namep = uc_priv->name[offset]; - if (skip_unused && !uc_priv->name[offset]) + if (skip_unused && !gpio_is_claimed(uc_priv, offset)) return GPIOF_UNUSED; if (ops->get_function) { int ret; @@ -1341,6 +1358,13 @@ static int gpio_post_probe(struct udevice *dev) if (!uc_priv->name) return -ENOMEM; + uc_priv->claimed = calloc(DIV_ROUND_UP(uc_priv->gpio_count, 32), + sizeof(*uc_priv->claimed)); + if (!uc_priv->claimed) { + free(uc_priv->name); + return -ENOMEM; + } + return gpio_renumber(NULL); } @@ -1353,6 +1377,7 @@ static int gpio_pre_remove(struct udevice *dev) if (uc_priv->name[i]) free(uc_priv->name[i]); } + free(uc_priv->claimed); free(uc_priv->name); return gpio_renumber(dev); diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index c4a7fd28439..a21c606f2b8 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -414,6 +414,7 @@ struct dm_gpio_ops { * @gpio_base: Base GPIO number for this device. For the first active device * this will be 0; the numbering for others will follow sequentially so that * @gpio_base for device 1 will equal the number of GPIOs in device 0. + * @claimed: Array of bits indicating which GPIOs in the bank are claimed. * @name: Array of pointers to the name for each GPIO in this bank. The * value of the pointer will be NULL if the GPIO has not been claimed. */ @@ -421,6 +422,7 @@ struct gpio_dev_priv { const char *bank_name; unsigned gpio_count; unsigned gpio_base; + u32 *claimed; char **name; }; -- 2.40.1

2 2