November 2023 - U-Boot

[PATCH] mtd: spi: flash_is_unlocked return values fix
by Stanislav Bolshakov 18 Dec '23

18 Dec '23

In accordance with the name of the function 'flash_is_unlocked()', it is implied that the return value will be either 'true' or 'false'. Moreover, calling this function from other parts of the program is based precisely on this fact. The value of the pointer to the actual called function 'flash_is_unlocked()' depends on the memory manufacturer and can be stm_is_unlocked() or sst26_is_unlocked(). These two functions have inconsistent return values. This patch fixes this inconsistency. --- drivers/mtd/spi/spi-nor-core.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index db20feb4da..100fce624b 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -1373,18 +1373,21 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) * Check if a region of the flash is (completely) unlocked. See stm_lock() for * more info. * - * Returns 1 if entire region is unlocked, 0 if any portion is locked, and - * negative on errors. + * Returns 1 if entire region is unlocked, 0 if any portion is locked or + * on errors. */ static int stm_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len) { int status; + int rv; status = read_sr(nor); if (status < 0) - return status; + return 0; - return stm_is_unlocked_sr(nor, ofs, len, status); + rv = stm_is_unlocked_sr(nor, ofs, len, status); + + return (rv == 1) ? 1 : 0; } #endif /* CONFIG_SPI_FLASH_STMICRO */ @@ -1617,11 +1620,13 @@ static int sst26_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) } /* - * Returns EACCES (positive value) if region is (partially) locked, 0 if region - * is completely unlocked, and negative on errors. + * Returns 1 if region is completely unlocked + * and 0 on errors or if region is (partially) locked. */ static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len) { + int rv; + /* * is_unlocked function is used for check before reading or erasing * flash region, so offset and length might be not 64k aligned, so @@ -1631,7 +1636,8 @@ static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len) ofs -= ofs & (SZ_64K - 1); len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len; - return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK); + rv = sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK); + return (rv == 0) ? 1 : 0; } static int sst_write_byteprogram(struct spi_nor *nor, loff_t to, size_t len, -- 2.30.2

2 1

[PATCH v2 00/12] cmd: bootefi: refactor the code for bootmgr
by AKASHI Takahiro 17 Dec '23

17 Dec '23

This patch set is motivated by the discussion[1] regarding CONFIG_BOOTEFI_BOOTMGR option. At the end, bootefi.c will be decomposed into two parts, one for providing the command itself and one for implementing helper functions. EFI_LOADER will now be available without CONFIG_CMDLINE or specifically CONFIG_CMD_BOOTEFI if invoked via bootmeth/bootstd. Then, EFI_LOADER library side will be further split into two options for fine-grain control: CONFIG_EFI_BINARY_EXEC: execute UEFI binaries which are to be explicitly loaded by U-Boot's load commands/functions or other methods (like a jtag debugger?) It supports bootmeth_efi as well as "bootefi <addr>|hello"(/"bootm"?). CONFIG_EFI_BOOTMGR: provide EFI boot manger functionality It supports bootmeth_efi_mgr as well as "bootefi bootmgr". As such, We will no longer need CONFIG_EFI_BINARY_EXEC if we want to only make use of the UEFI boot manger for booting a next stage OS. Prerequisite ============ This patch set is based on top of Tom's "next" branch. Patches ======= Patch#1-#12: I hope that those commits show step-by-step refactoring without introducing degradation. Tests ===== * run UT efi_selftest on sandbox locally * run test_efi_bootmgr on sandbox locally Unfortunately, I could not submit a pull request for CI test. Changes ======= v2 (Nov 21, 2023) * rebased onto Tom's next branch * remove already merged commits * revise commit messages * add patch #5 which was split from ex-patch#5 RFC (Oct 26, 2023) [1] https://lists.denx.de/pipermail/u-boot/2023-October/534598.html AKASHI Takahiro (12): cmd: bootefi: unfold do_bootefi_image() cmd: bootefi: re-organize do_bootefi() cmd: bootefi: carve out EFI boot manager interface cmd: bootefi: carve out binary execution interface cmd: bootefi: localize global device paths for efi_selftest cmd: bootefi: move library interfaces under lib/efi_loader cmd: efidebug: ease efi configuration dependency bootmeth: use efi_loader interfaces instead of bootefi command efi_loader: split unrelated code from efi_bootmgr.c efi_loader: rename BOOTEFI_BOOTMGR to EFI_BOOTMGR net: tftp: remove explicit efi configuration dependency fs: remove explicit efi configuration dependency boot/Kconfig | 4 +- boot/Makefile | 2 +- boot/bootm_os.c | 31 +- boot/bootmeth_efi.c | 8 +- boot/bootmeth_efi_mgr.c | 2 +- cmd/Kconfig | 21 +- cmd/bootefi.c | 670 +++++-------------------------- cmd/efidebug.c | 4 +- fs/fs.c | 7 +- include/efi_loader.h | 34 +- lib/efi_loader/Kconfig | 11 +- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_bootmgr.c | 37 ++ lib/efi_loader/efi_device_path.c | 3 +- lib/efi_loader/efi_helper.c | 498 ++++++++++++++++++++++- net/tftp.c | 10 +- test/boot/bootflow.c | 2 +- 17 files changed, 700 insertions(+), 646 deletions(-) -- 2.34.1

3 26

[PATCH] arm: dts: rockpro64: Add RockPro64 smbios
by Shantur Rathore 16 Dec '23

16 Dec '23

--- arch/arm/dts/rk3399-rockpro64.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/dts/rk3399-rockpro64.dtsi b/arch/arm/dts/rk3399-rockpro64.dtsi index 6bff8db7d3..cf850a69e6 100644 --- a/arch/arm/dts/rk3399-rockpro64.dtsi +++ b/arch/arm/dts/rk3399-rockpro64.dtsi @@ -20,6 +20,26 @@ stdout-path = "serial2:1500000n8"; }; + smbios { + compatible = "u-boot,sysinfo-smbios"; + smbios { + system { + manufacturer = "PINE64"; + product = "RockPro64"; + }; + + baseboard { + manufacturer = "PINE64"; + product = "RockPro64"; + }; + + chassis { + manufacturer = "PINE64"; + product = "RockPro64"; + }; + }; + }; + clkin_gmac: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; -- 2.40.1

5 13

[PATCH] arm: dts: imx8mp-venice-gw72xx: add TPM device
by Tim Harvey 16 Dec '23

16 Dec '23

Add the TPM device found on the GW72xx revision F PCB. This hangs off of SPI2, uses gpio1_10 as a CS and gpio1_11 as RST#. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi | 9 +++++++++ arch/arm/dts/imx8mp-venice-gw72xx.dtsi | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi index 7f2609ab5469..525316d11892 100644 --- a/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi @@ -4,6 +4,15 @@ */ #include "imx8mp-venice-gw702x-u-boot.dtsi" +&gpio1 { + tpm_rst { + gpio-hog; + output-high; + gpios = <11 GPIO_ACTIVE_HIGH>; + line-name = "tpm_rst#"; + }; +}; + &gpio4 { dio_1 { gpio-hog; diff --git a/arch/arm/dts/imx8mp-venice-gw72xx.dtsi b/arch/arm/dts/imx8mp-venice-gw72xx.dtsi index e05fdecdaf4f..4e726128ccfc 100644 --- a/arch/arm/dts/imx8mp-venice-gw72xx.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw72xx.dtsi @@ -83,8 +83,14 @@ &ecspi2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi2>; - cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>; + cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>, + <&gpio1 10 GPIO_ACTIVE_LOW>; status = "okay"; + tpm@1 { + compatible = "tcg,tpm_tis-spi"; + reg = <0x1>; + spi-max-frequency = <36000000>; + }; }; &gpio4 { @@ -286,6 +292,7 @@ MX8MP_IOMUXC_ECSPI2_MOSI__ECSPI2_MOSI 0x140 MX8MP_IOMUXC_ECSPI2_MISO__ECSPI2_MISO 0x140 MX8MP_IOMUXC_ECSPI2_SS0__GPIO5_IO13 0x140 + MX8MP_IOMUXC_GPIO1_IO10__GPIO1_IO10 0x140 >; }; -- 2.25.1

2 2

[PATCH] arm: dts: imx8mm-venice-gw72xx: add TPM device
by Tim Harvey 16 Dec '23

16 Dec '23

Add the TPM device found on the GW72xx revision F PCB. This hangs off of SPI2, uses gpio1_10 as a CS and gpio1_11 as RST#. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi | 7 +++++++ arch/arm/dts/imx8mm-venice-gw72xx.dtsi | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi index 92e44d4ba96b..31f9d47bced8 100644 --- a/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi @@ -39,6 +39,13 @@ gpios = <9 GPIO_ACTIVE_HIGH>; line-name = "dio1"; }; + + tpm_rst { + gpio-hog; + output-high; + gpios = <11 GPIO_ACTIVE_HIGH>; + line-name = "tpm_rst#"; + }; }; &gpio4 { diff --git a/arch/arm/dts/imx8mm-venice-gw72xx.dtsi b/arch/arm/dts/imx8mm-venice-gw72xx.dtsi index 41d0de6a7027..97ed34a3c586 100644 --- a/arch/arm/dts/imx8mm-venice-gw72xx.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw72xx.dtsi @@ -84,8 +84,15 @@ &ecspi2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi2>; - cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>; + cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>, + <&gpio1 10 GPIO_ACTIVE_LOW>; status = "okay"; + + tpm@1 { + compatible = "tcg,tpm_tis-spi"; + reg = <0x1>; + spi-max-frequency = <36000000>; + }; }; &gpio1 { @@ -314,6 +321,7 @@ MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0xd6 MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0xd6 MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0xd6 + MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0xd6 >; }; -- 2.25.1

2 2

[PATCH] board: ti: k3: Remove need for CFG_SYS_SDRAM_BASE
by Andrew Davis 15 Dec '23

15 Dec '23

The base address of extended DDR does not change across the K3 family. Setting this per SoC is not needed. Remove this definition to help remove the last bits from K3 include/configs/*.h files. Signed-off-by: Andrew Davis <afd(a)ti.com> --- board/ti/am65x/evm.c | 4 ++-- board/ti/j721e/evm.c | 4 ++-- board/ti/j721s2/evm.c | 4 ++-- include/configs/am62ax_evm.h | 4 ---- include/configs/am65x_evm.h | 3 --- include/configs/j721e_evm.h | 2 -- include/configs/j721s2_evm.h | 3 --- 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 975eb17946f..df209021c1b 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -73,13 +73,13 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size) int dram_init_banksize(void) { /* Bank 0 declares the memory available in the DDR low region */ - gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].start = 0x80000000; gd->bd->bi_dram[0].size = 0x80000000; gd->ram_size = 0x80000000; #ifdef CONFIG_PHYS_64BIT /* Bank 1 declares the memory available in the DDR high region */ - gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1; + gd->bd->bi_dram[1].start = 0x880000000; gd->bd->bi_dram[1].size = 0x80000000; gd->ram_size = 0x100000000; #endif diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 0768385f40c..c541880107e 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -61,13 +61,13 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size) int dram_init_banksize(void) { /* Bank 0 declares the memory available in the DDR low region */ - gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].start = 0x80000000; gd->bd->bi_dram[0].size = 0x80000000; gd->ram_size = 0x80000000; #ifdef CONFIG_PHYS_64BIT /* Bank 1 declares the memory available in the DDR high region */ - gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1; + gd->bd->bi_dram[1].start = 0x880000000; gd->bd->bi_dram[1].size = 0x80000000; gd->ram_size = 0x100000000; #endif diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c index db717390771..1220cd84519 100644 --- a/board/ti/j721s2/evm.c +++ b/board/ti/j721s2/evm.c @@ -56,13 +56,13 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size) int dram_init_banksize(void) { /* Bank 0 declares the memory available in the DDR low region */ - gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].start = 0x80000000; gd->bd->bi_dram[0].size = 0x7fffffff; gd->ram_size = 0x80000000; #ifdef CONFIG_PHYS_64BIT /* Bank 1 declares the memory available in the DDR high region */ - gd->bd->bi_dram[1].start = CFG_SYS_SDRAM_BASE1; + gd->bd->bi_dram[1].start = 0x880000000; gd->bd->bi_dram[1].size = 0x37fffffff; gd->ram_size = 0x400000000; #endif diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index 57003f120f9..496d1c2348f 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -12,10 +12,6 @@ #include <env/ti/mmc.h> #include <env/ti/k3_dfu.h> -/* DDR Configuration */ -#define CFG_SYS_SDRAM_BASE1 0x880000000 - - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 811dc0ff1a8..64458ebb4b8 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -14,9 +14,6 @@ #include <env/ti/k3_rproc.h> #include <env/ti/k3_dfu.h> -/* DDR Configuration */ -#define CFG_SYS_SDRAM_BASE1 0x880000000 - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index ea39d1bf824..c26438c8684 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -11,8 +11,6 @@ #include <linux/sizes.h> -/* DDR Configuration */ -#define CFG_SYS_SDRAM_BASE1 0x880000000 /* FLASH Configuration */ #define CFG_SYS_FLASH_BASE 0x000000000 diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index 692c6bb5e42..846cfa7531c 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -12,9 +12,6 @@ #include <linux/sizes.h> #include <config_distro_bootcmd.h> -/* DDR Configuration */ -#define CFG_SYS_SDRAM_BASE1 0x880000000 - /* SPL Loader Configuration */ #if defined(CONFIG_TARGET_J721S2_A72_EVM) #define CFG_SYS_UBOOT_BASE 0x50280000 -- 2.39.2

2 1

[PATCH 0/4] board: ti: Update to latest board configuration
by Vishal Mahaveer 15 Dec '23

15 Dec '23

This patch series brings in the latest board configurations for am62 and am62a device. Patch "board: ti: am62x/am62ax: Update virtual interrupt allocations in board config" is needed for booting with the latest TIFS and DM firmware [1]. [1] https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?h=ti-linu… SHA: e891ddc65c55bfa7111e4f45834b7c26444dff72 U-boot boot log - https://gist.github.com/vishalmti/6b38fb80d557478131d5aaed5aeb3596 Vishal Mahaveer (4): board: ti: am62x/am62ax: Formatting updates to board config files board: ti: am62ax: Add C7x resource allocation entries to board config board: ti: am62x/am62ax: Update MCU GPIO interrupt allocation in board config board: ti: am62x/am62ax: Update virtual interrupt allocations in board config board/ti/am62ax/rm-cfg.yaml | 522 +++++++++++++++--------------------- board/ti/am62x/rm-cfg.yaml | 481 +++++++++++++-------------------- 2 files changed, 396 insertions(+), 607 deletions(-) -- 2.36.1

4 10

[PATCH v2 0/4] Unify K3 initial memory map
by Andrew Davis 15 Dec '23

15 Dec '23

Hello all, This was an RFC as it might still break remoteproc loading, but posted now for merge as worst case this would expose the issue in remoteproc loading better and force someone to go fix it. :) Changes for v2: - Add patch adding firewall MMU hole for Jacinto devices Changes for non-RFC: - Included dependency patch from here[0] into this series - Add Tested-bys - Rebase on latest -next Thanks, Andrew [0] https://lore.kernel.org/all/20231122211218.607757-1-afd@ti.com/ Andrew Davis (4): arm: mach-k3: Let the compiler size the mem_map lists arm: mach-k3: Do not map ATF and OPTEE regions in MMU arm: mach-k3: Remove non-cached memory map areas arm: mach-k3: Merge initial memory maps arch/arm/mach-k3/arm64-mmu.c | 271 +---------------------------------- 1 file changed, 3 insertions(+), 268 deletions(-) -- 2.39.2

3 10

[PATCH v2] arm: mach-k3: Move K3 common schema.yaml out of board directory
by Andrew Davis 15 Dec '23

15 Dec '23

This file is common for all K3, move it out of board/ directory and into mach-k3. As we need to change the path in k3-binman.dtsi let's take this opportunity to switch to absolute paths which makes adding non-TI boards (like Toradex Verdin) not need to override these paths. Signed-off-by: Andrew Davis <afd(a)ti.com> --- Changes for v2: - Rebased on -next .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 66 ------------------- arch/arm/dts/k3-binman.dtsi | 28 ++++---- .../common => arch/arm/mach-k3}/schema.yaml | 0 3 files changed, 14 insertions(+), 80 deletions(-) rename {board/ti/common => arch/arm/mach-k3}/schema.yaml (100%) diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index ed2c4482ef0..dd832ee1f3d 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -5,72 +5,6 @@ #include "k3-binman.dtsi" -#ifndef CONFIG_ARM64 - -&bcfg_yaml { - schema = "../../ti/common/schema.yaml"; -}; - -&pcfg_yaml { - schema = "../../ti/common/schema.yaml"; -}; - -&rcfg_yaml { - schema = "../../ti/common/schema.yaml"; -}; - -&scfg_yaml { - schema = "../../ti/common/schema.yaml"; -}; - -/* combined-tifs-cfg */ - -&bcfg_yaml_tifs { - schema = "../../ti/common/schema.yaml"; -}; - -&pcfg_yaml_tifs { - schema = "../../ti/common/schema.yaml"; -}; - -&rcfg_yaml_tifs { - schema = "../../ti/common/schema.yaml"; -}; - -&scfg_yaml_tifs { - schema = "../../ti/common/schema.yaml"; -}; - -/* combined-dm-cfg */ - -&pcfg_yaml_dm { - schema = "../../ti/common/schema.yaml"; -}; - -&rcfg_yaml_dm { - schema = "../../ti/common/schema.yaml"; -}; - -/* combined-sysfw-cfg */ - -&bcfg_yaml_sysfw { - schema = "../../ti/common/schema.yaml"; -}; - -&pcfg_yaml_sysfw { - schema = "../../ti/common/schema.yaml"; -}; - -&rcfg_yaml_sysfw { - schema = "../../ti/common/schema.yaml"; -}; - -&scfg_yaml_sysfw { - schema = "../../ti/common/schema.yaml"; -}; - -#endif /* CONFIG_ARM64 */ - #ifdef CONFIG_TARGET_VERDIN_AM62_R5 &binman { diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi index c7513e1a5dd..cd9926a0169 100644 --- a/arch/arm/dts/k3-binman.dtsi +++ b/arch/arm/dts/k3-binman.dtsi @@ -32,28 +32,28 @@ filename = "board-cfg.bin"; bcfg_yaml: ti-board-config { config = "board-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; pm-cfg { filename = "pm-cfg.bin"; pcfg_yaml: ti-board-config { config = "pm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; rm-cfg { filename = "rm-cfg.bin"; rcfg_yaml: ti-board-config { config = "rm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; sec-cfg { filename = "sec-cfg.bin"; scfg_yaml: ti-board-config { config = "sec-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; combined-tifs-cfg { @@ -61,19 +61,19 @@ ti-board-config { bcfg_yaml_tifs: board-cfg { config = "board-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; scfg_yaml_tifs: sec-cfg { config = "sec-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; pcfg_yaml_tifs: pm-cfg { config = "pm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; rcfg_yaml_tifs: rm-cfg { config = "rm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; }; @@ -82,11 +82,11 @@ ti-board-config { pcfg_yaml_dm: pm-cfg { config = "pm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; rcfg_yaml_dm: rm-cfg { config = "rm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; }; @@ -95,19 +95,19 @@ ti-board-config { bcfg_yaml_sysfw: board-cfg { config = "board-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; scfg_yaml_sysfw: sec-cfg { config = "sec-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; pcfg_yaml_sysfw: pm-cfg { config = "pm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; rcfg_yaml_sysfw: rm-cfg { config = "rm-cfg.yaml"; - schema = "board/ti/common/schema.yaml"; + schema = "arch/arm/mach-k3/schema.yaml"; }; }; }; diff --git a/board/ti/common/schema.yaml b/arch/arm/mach-k3/schema.yaml similarity index 100% rename from board/ti/common/schema.yaml rename to arch/arm/mach-k3/schema.yaml -- 2.39.2

2 1

[PATCH v7 0/8] clk: Switch from soc_clk_dump to clk_ops function
by Igor Prusov 15 Dec '23

15 Dec '23

Currently clock providers may override default implementation of soc_clk_dump function to replace clk dump command output. This causes confusing behaviour when u-boot is built with one of such drivers enabled but still has clocks defined using CCF. For example, enabling CMD_CLK and using clk dump on sandbox target will not show CCF clocks because k210 driver overrides common soc_clk_dump. Changelog: v1 -> v2: - Add missing static to dump functions v2 -> v3: - Make soc_clk_dump in cmd/clk.c static instead of removing __weak v3 -> v4: - Rebase and refactor dump for new Amlogic A1 clock controller driver v4 -> v5: - Add docs for dump() function in clk_ops - Print driver and device names before calling corresponding dump() v5 -> v6: - dump() return type changed to void - meson_clk_dump() and helper functions moved under CONFIG_CMD_CLK to fix unused-function diagnostic v6 -> v7: - fix return type of k210_clk_dump() - fix clk_ops dump() docs since it returns void now Igor Prusov (8): clk: zynq: Move soc_clk_dump to Zynq clock driver clk: ast2600: Move soc_clk_dump function clk: k210: Move soc_clk_dump function clk: amlogic: Move driver and ops structs clk: Add dump operation to clk_ops cmd: clk: Use dump function from clk_ops clk: treewide: switch to clock dump from clk_ops cmd: clk: Make soc_clk_dump static arch/arm/mach-zynq/clk.c | 57 -------------- arch/mips/mach-pic32/cpu.c | 23 ------ cmd/clk.c | 13 +++- drivers/clk/aspeed/clk_ast2600.c | 83 ++++++++++---------- drivers/clk/clk_k210.c | 104 ++++++++++++------------- drivers/clk/clk_pic32.c | 37 +++++++++ drivers/clk/clk_versal.c | 9 ++- drivers/clk/clk_zynq.c | 52 +++++++++++++ drivers/clk/clk_zynqmp.c | 22 +++--- drivers/clk/imx/clk-imx8.c | 13 +--- drivers/clk/meson/a1.c | 58 ++++++-------- drivers/clk/mvebu/armada-37xx-periph.c | 20 +++-- drivers/clk/stm32/clk-stm32mp1.c | 31 ++------ include/clk-uclass.h | 13 ++++ include/clk.h | 2 - 15 files changed, 269 insertions(+), 268 deletions(-) -- 2.34.1

3 12