board: toradex: add verdin am62 support
v6 cover board: toradex: add verdin am62 support
From: Marcel Ziswiler <[email protected]>
This series adds initial support for the Toradex Verdin AM62 SoM [1]. The first commit adds resp. PID4s to the ConfigBlock, the second one fixes an early clocking issue confirmed to be a weird bug in TI's scripting, the third one fixes some binman labeling issue. And last but not least support for the Toradex Verdin AM62 is added.
Azure CI still running [2]. Thanks!
[1] https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=6804&view=results
Changes in v6:
- New commit fixing rcfg_yaml and pcfg_yaml labels actually pointing at correct yamls and adding labels for the remaining items.
- Instead of duplicating the whole binman configuration just use phandles to override relevant properties where feasible.
- Fix indentation in include/configs/verdin-am62.h.
Thanks to Neha for pointing me towards actually making use of those labels.
- Also remove some spurious newlines from our binman configuration file.
Changes in v5:
- Fix doc/board/toradex/verdin-am62.rst title underline being too short.
- Add verdin-am62 to doc/board/toradex/index.rst.
Thanks to Emanuele having run this series on the azure CI to find out.
- Update U-Boot output in doc/board/toradex/verdin-am62.rst to latest.
- State that the device trees were taken straight from Linux v6.5-rc1.
- Remove k3-am625-verdin-wifi-dev-binman.dtsi include from r5 dts.
- Remove memory@ and reserved-memory nodes.
- Simplify sa_secproxy and esm nodes.
- Get rid of ifdef zeros around usb stuff in device trees.
- Re-work doc/board/toradex/verdin-am62.rst in a more re-usable way. Thanks to Nishanth for pointing those differences out as compared to arch/arm/dts/k3-am625-r5-sk.dts and his suggestions on the rst stuff.
Changes in v4:
- Re-based on top of master with recent binman integration, mac_efuse, cpsw-phy-sel and mdio clean-up and dtsi bump from linux v6.5-rc1.
- Verdin AM62 binman enablement and further clean-up after re-base.
- Removed all ifdefs from DTs now with bumped Linux dtsi.
- Avoid relocated U-Boot and DT reserved-memory clash.
- Enable of_system_setup.
Changes in v3:
- Add Verdin AM62 launch configuration SKUs as well.
- Integrate our recent find of CTRL_SLEEP_MOCI# needing to be driven from A53 SPL as it may be used to control some power-rails on the carrier board. E.g. on the Yavia carrier board it is needed to power the I2C EEPROM on the carrier board.
- Improve boot environment in R5 SPL vs. A53.
- Integrate launch configuration SKUs to Wi-Fi handling.
- Re-sync device trees from Linux kernel v6.5-rc1.
- Add warning if memory is less than expected.
Changes in v2:
- Add Bryan's reviewed-by tag. Thanks!
- Use 1.2 GHz rather than 1.25 GHz A53 clock as on the EVM/SK.
- Also add power-domain 166 as on the EVM/SK.
- Get rid of main_bcdma and main_pktdma as not required in R5 SPL.
- Get rid of all bootph-pre-ram in Ethernet and SDHC1 aka SD card related pinctrls as not required in any SPL.
- Enable CONFIG_TI_SECURE_DEVICE by default as Non-HS devices will continue to boot due to runtime device type detection.
- Disable FAT and SPI support as not required in R5 SPL.
- Also enable CONFIG_SPL_MMC_HS200_SUPPORT in R5 SPL.
- Enable CONFIG_LEGACY_IMAGE_FORMAT to allow sourcing unsigned script images e.g. like our current boot scripts.
- Increase CONFIG_SYS_BOOTM_LEN to 64 MB to allow booting bigger compressed images as e.g. in the Toradex Easy Installer case.
- Change memory configurations to operate at temperatures of up to 95 degrees celsius.
- Increase CONFIG_SYS_MAXARGS from default 16 to 64.
- Enable CONFIG_CMD_REMOTEPROC, CONFIG_SPL_DM_GPIO_LOOKUP_LABEL and CONFIG_SPL_I2C_EEPROM.
- For R5 SPL increase CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN to 0x140000, enable CONFIG_SPL_I2C, CONFIG_DM_I2C and CONFIG_SYS_I2C_OMAP24XX and savedefconfig got rid of CONFIG_SPL_FIT_IMAGE_POST_PROCESS.
Marcel Ziswiler (4):
toradex: tdx-cfg-block: add verdin am62 skus
arm: mach-k3: am62: fix 2nd mux option of clkout0
arm: dts: k3-binman: fix rcfg_yaml and pcfg_yaml labels
board: toradex: add verdin am62 support
arch/arm/dts/Makefile | 4 +- arch/arm/dts/k3-am62-verdin-dev.dtsi | 190 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1401 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 84 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 532 ++++ .../dts/k3-am625-verdin-wifi-dev-u-boot.dtsi | 201 ++ arch/arm/dts/k3-am625-verdin-wifi-dev.dts | 22 + arch/arm/dts/k3-binman.dtsi | 16 +- arch/arm/mach-k3/Kconfig | 1 + arch/arm/mach-k3/am62x/clk-data.c | 5 +- board/toradex/common/tdx-cfg-block.c | 7 + board/toradex/common/tdx-cfg-block.h | 10 +- board/toradex/verdin-am62/Kconfig | 82 + board/toradex/verdin-am62/MAINTAINERS | 17 + board/toradex/verdin-am62/Makefile | 6 + board/toradex/verdin-am62/board-cfg.yaml | 36 + board/toradex/verdin-am62/pm-cfg.yaml | 12 + board/toradex/verdin-am62/rm-cfg.yaml | 1088 ++++++++ board/toradex/verdin-am62/sec-cfg.yaml | 379 +++ board/toradex/verdin-am62/verdin-am62.c | 131 + configs/verdin-am62_a53_defconfig | 187 ++ configs/verdin-am62_r5_defconfig | 111 + doc/board/ti/am62x_sk.rst | 16 +- doc/board/ti/k3.rst | 1 + doc/board/toradex/index.rst | 1 + doc/board/toradex/verdin-am62.rst | 130 + include/configs/verdin-am62.h | 55 + 29 files changed, 6933 insertions(+), 21 deletions(-) create mode 100644 arch/arm/dts/k3-am62-verdin-dev.dtsi create mode 100644 arch/arm/dts/k3-am62-verdin-wifi.dtsi create mode 100644 arch/arm/dts/k3-am62-verdin.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-r5.dts create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev.dts create mode 100644 board/toradex/verdin-am62/Kconfig create mode 100644 board/toradex/verdin-am62/MAINTAINERS create mode 100644 board/toradex/verdin-am62/Makefile create mode 100644 board/toradex/verdin-am62/board-cfg.yaml create mode 100644 board/toradex/verdin-am62/pm-cfg.yaml create mode 100644 board/toradex/verdin-am62/rm-cfg.yaml create mode 100644 board/toradex/verdin-am62/sec-cfg.yaml create mode 100644 board/toradex/verdin-am62/verdin-am62.c create mode 100644 configs/verdin-am62_a53_defconfig create mode 100644 configs/verdin-am62_r5_defconfig create mode 100644 doc/board/toradex/verdin-am62.rst create mode 100644 include/configs/verdin-am62.h
Signature · 1 line
2.36.1
PATCH v6 1/4 toradex: tdx-cfg-block: add verdin am62 skus
From: Marcel Ziswiler <[email protected]>
Add initial Verdin AM62 Quad 1GB WB IT prototype and launch configuration SKUs to ConfigBlock handling.
0069: Verdin AM62 Quad 1GB WB IT
0071: Verdin AM62 Solo 512MB
0072: Verdin AM62 Solo 512MB WB IT
0073: Verdin AM62 Dual 1GB ET
0074: Verdin AM62 Dual 1GB IT
0075: Verdin AM62 Dual 1GB WB IT
0076: Verdin AM62 Quad 2GB WB IT
---
(no changes since v3)
Changes in v3:
- Add Verdin AM62 launch configuration SKUs as well.
board/toradex/common/tdx-cfg-block.c | 7 +++++++ board/toradex/common/tdx-cfg-block.h | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
board/toradex/common/tdx-cfg-block.c +7 -0
@@ -139,7 +139,14 @@ const struct toradex_som toradex_modules[] = { [66] = { "Verdin iMX8M Plus Quad 8GB WB", TARGET_IS_ENABLED(VERDIN_IMX8MP) }, [67] = { "Apalis iMX8QM 8GB WB IT", TARGET_IS_ENABLED(APALIS_IMX8) }, [68] = { "Verdin iMX8M Mini Quad 2GB WB IT", TARGET_IS_ENABLED(VERDIN_IMX8MM) }, + [69] = { "Verdin AM62 Quad 1GB WB IT", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, [70] = { "Verdin iMX8M Plus Quad 8GB WB IT", TARGET_IS_ENABLED(VERDIN_IMX8MP) }, + [71] = { "Verdin AM62 Solo 512MB", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, + [72] = { "Verdin AM62 Solo 512MB WB IT", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, + [73] = { "Verdin AM62 Dual 1GB ET", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, + [74] = { "Verdin AM62 Dual 1GB IT", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, + [75] = { "Verdin AM62 Dual 1GB WB IT", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, + [76] = { "Verdin AM62 Quad 2GB WB IT", TARGET_IS_ENABLED(VERDIN_AM62_A53) }, };const char *const toradex_carrier_boards[] = {
board/toradex/common/tdx-cfg-block.h +8 -2
@@ -94,8 +94,14 @@ enum {VERDIN_IMX8MPQ_8GB_WIFI_BT ,APALIS_IMX8QM_8GB_WIFI_BT_IT ,VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN , -/* 69 */ - VERDIN_IMX8MPQ_8GB_WIFI_BT_IT = 70, /* 70 */ +VERDIN_AM62Q_WIFI_BT_IT , +VERDIN_IMX8MPQ_8GB_WIFI_BT_IT ,/* 70 */ +VERDIN_AM62S_512MB , +VERDIN_AM62S_512MB_WIFI_BT_IT , +VERDIN_AM62D_1G_ET , +VERDIN_AM62D_1G_IT , +VERDIN_AM62D_1G_WIFI_BT_IT ,/* 75 */ + VERDIN_AM62Q_2G_WIFI_BT_IT, }; enum {
Signature · 1 line
2.36.1
Re: [PATCH v6 1/4] toradex: tdx-cfg-block: add verdin am62 skus
Quoted 13 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
Add initial Verdin AM62 Quad 1GB WB IT prototype and launch configuration SKUs to ConfigBlock handling.
0069: Verdin AM62 Quad 1GB WB IT
0071: Verdin AM62 Solo 512MB
0072: Verdin AM62 Solo 512MB WB IT
0073: Verdin AM62 Dual 1GB ET
0074: Verdin AM62 Dual 1GB IT
0075: Verdin AM62 Dual 1GB WB IT
0076: Verdin AM62 Quad 2GB WB IT
Quoted 4 lines
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Emanuele Ghidoli <[email protected]>---
Briefly reviewed for sanity:
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [PATCH v6 1/4] toradex: tdx-cfg-block: add verdin am62 skus
In reply to Marcel ZiswilerQuoted 13 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
Add initial Verdin AM62 Quad 1GB WB IT prototype and launch configuration SKUs to ConfigBlock handling.
0069: Verdin AM62 Quad 1GB WB IT
0071: Verdin AM62 Solo 512MB
0072: Verdin AM62 Solo 512MB WB IT
0073: Verdin AM62 Dual 1GB ET
0074: Verdin AM62 Dual 1GB IT
0075: Verdin AM62 Dual 1GB WB IT
0076: Verdin AM62 Quad 2GB WB IT
Quoted 2 lines
Signed-off-by Marcel Ziswiler <[email protected]>Signed-off-by Emanuele Ghidoli <[email protected]>
For the series, applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v6 2/4 arm: mach-k3: am62: fix 2nd mux option of clkout0
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Fix second mux option of clkout0 which should really be DEV_BOARD0_CLKOUT0_IN_PARENT_HSDIV4_16FFT_MAIN_2_HSDIVOUT1_CLK10 rather than twice the same according to [1].
[1] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/am62x/clocks.html#clocks-for-board0-device
---
(no changes since v2)
Changes in v2:
- Add Bryan's reviewed-by tag. Thanks!
arch/arm/mach-k3/am62x/clk-data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-k3/am62x/clk-data.c +3 -2
@@ -57,7 +57,7 @@ static const char * const sam62_pll_ctrl_wrap_mcu_0_sysclkout_clk_parents[] = {static const char *const clkout0_ctrl_out0_parents[] = {"hsdiv4_16fft_main_2_hsdivout1_clk" , -"hsdiv4_16fft_main_2_hsdivout1_clk" , +"hsdiv4_16fft_main_2_hsdivout1_clk10" , };static const char *const clk_32k_rc_sel_out0_parents[] = {
@@ -195,6 +195,7 @@ static const struct clk_data clk_list[] = {CLK_DIV ("hsdiv4_16fft_main_1_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681084 ,0 ,7 ,0 ,0 ),CLK_DIV ("hsdiv4_16fft_main_1_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681088 ,0 ,7 ,0 ,0 ),CLK_DIV ("hsdiv4_16fft_main_2_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_2_hsdivout1_clk10" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682084 ,0 ,7 ,0 ,0 ),CLK_DIV ("hsdiv4_16fft_main_2_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682088 ,0 ,7 ,0 ,0 ),CLK_DIV ("hsdiv4_16fft_mcu_0_hsdivout0_clk" ,"pllfracf_ssmod_16fft_mcu_0_foutvcop_clk" ,0x4040080 ,0 ,7 ,0 ,0 ), CLK_MUX_PLLCTRL("sam62_pll_ctrl_wrap_main_0_sysclkout_clk", sam62_pll_ctrl_wrap_main_0_sysclkout_clk_parents, 2, 0x410000, 0),
@@ -313,7 +314,7 @@ static const struct dev_clk soc_dev_clk_data[] = {DEV_CLK (146 ,5 ,"sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk" ),DEV_CLK (157 ,20 ,"clkout0_ctrl_out0" ),DEV_CLK (157 ,21 ,"hsdiv4_16fft_main_2_hsdivout1_clk" ), -DEV_CLK (157 ,22 ,"hsdiv4_16fft_main_2_hsdivout1_clk" ), +DEV_CLK (157 ,22 ,"hsdiv4_16fft_main_2_hsdivout1_clk10" ),DEV_CLK (157 ,24 ,"sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk" ),DEV_CLK (157 ,25 ,"board_0_ddr0_ck0_out" ), DEV_CLK(157, 40, "mshsi2c_main_0_porscl"),
Signature · 1 line
2.36.1
Re: [PATCH v6 2/4] arm: mach-k3: am62: fix 2nd mux option of clkout0
Quoted 10 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
Fix second mux option of clkout0 which should really be
DEV_BOARD0_CLKOUT0_IN_PARENT_HSDIV4_16FFT_MAIN_2_HSDIVOUT1_CLK10rather than twice the same according to [1].[1] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/am62x/clocks.html#clocks-for-board0-device
Signed-off-by Marcel Ziswiler <[email protected]>Reviewed-by Bryan Brattlof <[email protected]>
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v6 3/4 arm: dts: k3-binman: fix rcfg_yaml and pcfg_yaml labels
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Fix rcfg_yaml to really point to rm-cfg.yaml and pcfg_yaml to really point to pm-cfg.yaml which likely is the intention.
While at it also add labels for the remaining items like custmpk_pem, dkey_pem, bcfg_yaml_sysfw, scfg_yaml_sysfw, pcfg_yaml_sysfw and rcfg_yaml_sysfw.
---
Changes in v6:
- New commit fixing rcfg_yaml and pcfg_yaml labels actually pointing at correct yamls and adding labels for the remaining items.
Thanks to Neha for pointing me towards actually making use of those labels.
arch/arm/dts/k3-binman.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm/dts/k3-binman.dtsi +8 -8
@@ -12,14 +12,14 @@ &binman { custMpk { filename = "custMpk.pem"; - blob-ext { + custmpk_pem: blob-ext { filename = "../keys/custMpk.pem"; }; }; ti-degenerate-key { filename = "ti-degenerate-key.pem"; - blob-ext { + dkey_pem: blob-ext { filename = "../keys/ti-degenerate-key.pem"; }; };
@@ -37,14 +37,14 @@ }; pm-cfg { filename = "pm-cfg.bin"; - rcfg_yaml: ti-board-config { + pcfg_yaml: ti-board-config { config = "pm-cfg.yaml"; schema = "../common/schema.yaml"; }; }; rm-cfg { filename = "rm-cfg.bin"; - pcfg_yaml: ti-board-config { + rcfg_yaml: ti-board-config { config = "rm-cfg.yaml"; schema = "../common/schema.yaml"; };
@@ -93,19 +93,19 @@ combined-sysfw-cfg { filename = "combined-sysfw-cfg.bin"; ti-board-config { - board-cfg { + bcfg_yaml_sysfw: board-cfg { config = "board-cfg.yaml"; schema = "../common/schema.yaml"; }; - sec-cfg { + scfg_yaml_sysfw: sec-cfg { config = "sec-cfg.yaml"; schema = "../common/schema.yaml"; }; - pm-cfg { + pcfg_yaml_sysfw: pm-cfg { config = "pm-cfg.yaml"; schema = "../common/schema.yaml"; }; - rm-cfg { + rcfg_yaml_sysfw: rm-cfg { config = "rm-cfg.yaml"; schema = "../common/schema.yaml"; };
Signature · 1 line
2.36.1
Re: [PATCH v6 3/4] arm: dts: k3-binman: fix rcfg_yaml and pcfg_yaml labels
Hi Marcel
Quoted 50 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
Fix
rcfg_yamlto really point torm-cfg.yamlandpcfg_yamlto really point topm-cfg.yamlwhich likely is the intention.While at it also add labels for the remaining items like
custmpk_pem,dkey_pem,bcfg_yaml_sysfw,scfg_yaml_sysfw,pcfg_yaml_sysfwandrcfg_yaml_sysfw.Signed-off-by Marcel Ziswiler <[email protected]>---
Changes in v6:
- New commit fixingrcfg_yamlandpcfg_yamllabels actually pointing at correct yamls and adding labels for the remaining items.
Thanks to Neha for pointing me towards actually making use of those labels.arch/arm/dts/k3-binman.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)arch/arm/dts/k3-binman.dtsi +3
-3@@ -12,14 +12,14 @@ &binman { custMpk { filename = "custMpk.pem"; - blob-ext { + custmpk_pem: blob-ext { filename = "../keys/custMpk.pem"; }; }; ti-degenerate-key { filename = "ti-degenerate-key.pem"; - blob-ext { + dkey_pem: blob-ext { filename = "../keys/ti-degenerate-key.pem"; }; };@@ -37,14 +37,14 @@ }; pm-cfg { filename = "pm-cfg.bin"; - rcfg_yaml: ti-board-config { + pcfg_yaml: ti-board-config { config = "pm-cfg.yaml";
arch/arm/dts/k3-binman.dtsi line 50
Quoted 10 lines
arch/arm/dts/k3-binman.dtsi +1
-1schema = "../common/schema.yaml"; }; }; rm-cfg { filename = "rm-cfg.bin"; - pcfg_yaml: ti-board-config { + rcfg_yaml: ti-board-config { config = "rm-cfg.yaml"; schema = "../common/schema.yaml"; };
Thanks for catching these as well!
Quoted 14 lines
arch/arm/dts/k3-binman.dtsi +2
-2@@ -93,19 +93,19 @@ combined-sysfw-cfg { filename = "combined-sysfw-cfg.bin"; ti-board-config { - board-cfg { + bcfg_yaml_sysfw: board-cfg { config = "board-cfg.yaml"; schema = "../common/schema.yaml"; }; - sec-cfg { + scfg_yaml_sysfw: sec-cfg { config = "sec-cfg.yaml"; schema = "../common/schema.yaml"; };
arch/arm/dts/k3-binman.dtsi line 111
Quoted 10 lines
arch/arm/dts/k3-binman.dtsi +2
-2- pm-cfg { + pcfg_yaml_sysfw: pm-cfg { config = "pm-cfg.yaml"; schema = "../common/schema.yaml"; }; - rm-cfg { + rcfg_yaml_sysfw: rm-cfg { config = "rm-cfg.yaml"; schema = "../common/schema.yaml"; };
Signature · 2 lines
Thanking You Neha Malcom Francis
Re: [PATCH v6 3/4] arm: dts: k3-binman: fix rcfg_yaml and pcfg_yaml labels
In reply to Marcel ZiswilerQuoted 10 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
Fix
rcfg_yamlto really point torm-cfg.yamlandpcfg_yamlto really point topm-cfg.yamlwhich likely is the intention.While at it also add labels for the remaining items like
custmpk_pem,dkey_pem,bcfg_yaml_sysfw,scfg_yaml_sysfw,pcfg_yaml_sysfwandrcfg_yaml_sysfw.Signed-off-by Marcel Ziswiler <[email protected]>
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v6 4/4 board: toradex: add verdin am62 support
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
The device trees were taken straight from Linux v6.5-rc1.
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE
---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)
---
Changes in v6:
- Instead of duplicating the whole binman configuration just use phandles to override relevant properties where feasible.
- Fix indentation in include/configs/verdin-am62.h.
Thanks to Neha for pointing me towards actually making use of those labels.
- Also remove some spurious newlines from our binman configuration file.
Changes in v5:
- Fix doc/board/toradex/verdin-am62.rst title underline being too short.
- Add verdin-am62 to doc/board/toradex/index.rst.
Thanks to Emanuele having run this series on the azure CI to find out.
- Update U-Boot output in doc/board/toradex/verdin-am62.rst to latest.
- State that the device trees were taken straight from Linux v6.5-rc1.
- Remove k3-am625-verdin-wifi-dev-binman.dtsi include from r5 dts.
- Remove memory@ and reserved-memory nodes.
- Simplify sa_secproxy and esm nodes.
- Get rid of ifdef zeros around usb stuff in device trees.
- Re-work doc/board/toradex/verdin-am62.rst in a more re-usable way. Thanks to Nishanth for pointing those differences out as compared to arch/arm/dts/k3-am625-r5-sk.dts and his suggestions on the rst stuff.
Changes in v4:
- Re-based on top of master with recent binman integration, mac_efuse, cpsw-phy-sel and mdio clean-up and dtsi bump from linux v6.5-rc1.
- Verdin AM62 binman enablement and further clean-up after re-base.
- Removed all ifdefs from DTs now with bumped Linux dtsi.
- Avoid relocated U-Boot and DT reserved-memory clash.
- Enable of_system_setup.
Changes in v3:
- Integrate our recent find of CTRL_SLEEP_MOCI# needing to be driven from A53 SPL as it may be used to control some power-rails on the carrier board. E.g. on the Yavia carrier board it is needed to power the I2C EEPROM on the carrier board.
- Improve boot environment in R5 SPL vs. A53.
- Integrate launch configuration SKUs to Wi-Fi handling.
- Re-sync device trees from Linux kernel v6.5-rc1.
- Add warning if memory is less than expected.
Changes in v2:
- Use 1.2 GHz rather than 1.25 GHz A53 clock as on the EVM/SK.
- Also add power-domain 166 as on the EVM/SK.
- Get rid of main_bcdma and main_pktdma as not required in R5 SPL.
- Get rid of all bootph-pre-ram in Ethernet and SDHC1 aka SD card related pinctrls as not required in any SPL.
- Enable CONFIG_TI_SECURE_DEVICE by default as Non-HS devices will continue to boot due to runtime device type detection.
- Disable FAT and SPI support as not required in R5 SPL.
- Also enable CONFIG_SPL_MMC_HS200_SUPPORT in R5 SPL.
- Enable CONFIG_LEGACY_IMAGE_FORMAT to allow sourcing unsigned script images e.g. like our current boot scripts.
- Increase CONFIG_SYS_BOOTM_LEN to 64 MB to allow booting bigger compressed images as e.g. in the Toradex Easy Installer case.
- Change memory configurations to operate at temperatures of up to 95 degrees celsius.
- Increase CONFIG_SYS_MAXARGS from default 16 to 64.
- Enable CONFIG_CMD_REMOTEPROC, CONFIG_SPL_DM_GPIO_LOOKUP_LABEL and CONFIG_SPL_I2C_EEPROM.
- For R5 SPL increase CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN to 0x140000, enable CONFIG_SPL_I2C, CONFIG_DM_I2C and CONFIG_SYS_I2C_OMAP24XX and savedefconfig got rid of CONFIG_SPL_FIT_IMAGE_POST_PROCESS.
arch/arm/dts/Makefile | 4 +- arch/arm/dts/k3-am62-verdin-dev.dtsi | 190 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1401 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 84 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 532 ++++ .../dts/k3-am625-verdin-wifi-dev-u-boot.dtsi | 201 ++ arch/arm/dts/k3-am625-verdin-wifi-dev.dts | 22 + arch/arm/mach-k3/Kconfig | 1 + board/toradex/verdin-am62/Kconfig | 82 + board/toradex/verdin-am62/MAINTAINERS | 17 + board/toradex/verdin-am62/Makefile | 6 + board/toradex/verdin-am62/board-cfg.yaml | 36 + board/toradex/verdin-am62/pm-cfg.yaml | 12 + board/toradex/verdin-am62/rm-cfg.yaml | 1088 ++++++++ board/toradex/verdin-am62/sec-cfg.yaml | 379 +++ board/toradex/verdin-am62/verdin-am62.c | 131 + configs/verdin-am62_a53_defconfig | 187 ++ configs/verdin-am62_r5_defconfig | 111 + doc/board/ti/am62x_sk.rst | 16 +- doc/board/ti/k3.rst | 1 + doc/board/toradex/index.rst | 1 + doc/board/toradex/verdin-am62.rst | 130 + include/configs/verdin-am62.h | 55 + 25 files changed, 6907 insertions(+), 9 deletions(-) create mode 100644 arch/arm/dts/k3-am62-verdin-dev.dtsi create mode 100644 arch/arm/dts/k3-am62-verdin-wifi.dtsi create mode 100644 arch/arm/dts/k3-am62-verdin.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-r5.dts create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi create mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev.dts create mode 100644 board/toradex/verdin-am62/Kconfig create mode 100644 board/toradex/verdin-am62/MAINTAINERS create mode 100644 board/toradex/verdin-am62/Makefile create mode 100644 board/toradex/verdin-am62/board-cfg.yaml create mode 100644 board/toradex/verdin-am62/pm-cfg.yaml create mode 100644 board/toradex/verdin-am62/rm-cfg.yaml create mode 100644 board/toradex/verdin-am62/sec-cfg.yaml create mode 100644 board/toradex/verdin-am62/verdin-am62.c create mode 100644 configs/verdin-am62_a53_defconfig create mode 100644 configs/verdin-am62_r5_defconfig create mode 100644 doc/board/toradex/verdin-am62.rst create mode 100644 include/configs/verdin-am62.h
arch/arm/dts/Makefile +3 -1
@@ -1319,7 +1319,9 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \ k3-am642-r5-sk.dtb dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \ - k3-am625-r5-sk.dtb + k3-am625-r5-sk.dtb \ + k3-am625-verdin-wifi-dev.dtb \ + k3-am625-verdin-r5.dtb dtb-$(CONFIG_SOC_K3_AM62A7) += k3-am62a7-sk.dtb \ k3-am62a7-r5-sk.dtb
arch/arm/dts/k3-am62-verdin-dev.dtsi new file +190 -0
190 lines not on this page · raw message
arch/arm/dts/k3-am62-verdin-wifi.dtsi new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2023 Toradex + * + * Common dtsi for Verdin AM62 SoM WB variant + * + * https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62 + */ + +/ { + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wifi_en>; + reset-gpios = <&main_gpio0 22 GPIO_ACTIVE_LOW>; + }; +}; + +/* On-module Wi-Fi */ +&sdhci2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci2>; + bus-width = <4>; + cap-power-off-card; + keep-power-in-suspend; + mmc-pwrseq = <&wifi_pwrseq>; + non-removable; + ti,fails-without-test-cd; + ti,driver-strength-ohm = <50>; + vmmc-supply = <®_3v3>; + status = "okay"; +}; + +/* On-module Bluetooth */ +&main_uart5 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart5>; + status = "okay"; +};
arch/arm/dts/k3-am62-verdin.dtsi new file +1401 -0
1,401 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi new file +2190 -0
1,360 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-r5.dts new file +84 -0
84 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +532 -0
532 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi new file +201 -0
201 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-wifi-dev.dts new file +22 -0
Lines of this file are not shown. View the raw message.
board/toradex/verdin-am62/Kconfig new file +82 -0
82 lines not on this page · raw message
board/toradex/verdin-am62/MAINTAINERS new file +17 -0
Lines of this file are not shown. View the raw message.
board/toradex/verdin-am62/Makefile new file +6 -0
Lines of this file are not shown. View the raw message.
board/toradex/verdin-am62/board-cfg.yaml new file +36 -0
Lines of this file are not shown. View the raw message.
board/toradex/verdin-am62/pm-cfg.yaml new file +12 -0
Lines of this file are not shown. View the raw message.
board/toradex/verdin-am62/rm-cfg.yaml new file +1088 -0
1,088 lines not on this page · raw message
board/toradex/verdin-am62/sec-cfg.yaml new file +379 -0
379 lines not on this page · raw message
board/toradex/verdin-am62/verdin-am62.c new file +131 -0
131 lines not on this page · raw message
configs/verdin-am62_a53_defconfig new file +187 -0
187 lines not on this page · raw message
configs/verdin-am62_r5_defconfig new file +111 -0
111 lines not on this page · raw message
doc/board/toradex/verdin-am62.rst new file +130 -0
130 lines not on this page · raw message
include/configs/verdin-am62.h new file +55 -0
55 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.36.1
Part of the diff is not shown here. View the raw message.
Hi Marcel
Quoted 8 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
Quoted 7 lines
The device trees were taken straight from Linux v6.5-rc1.
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE
---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)Signed-off-by Marcel Ziswiler <[email protected]>
Signature · 2 lines
Thanking You Neha Malcom Francis
Quoted 8 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
Quoted 8 lines
The device trees were taken straight from Linux v6.5-rc1.
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE
---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)Signed-off-by Marcel Ziswiler <[email protected]>
it looks like this patch is stuck in the mail-size quarantine.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Hi Nishanth
Quoted 11 lines · Nishanth Menon
Quoted 10 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
The device trees were taken straight from Linux v6.5-rc1.
Quoted 8 lines
Quoted 6 lines
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE ---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)Signed-off-by Marcel Ziswiler <[email protected]>it looks like this patch is stuck in the mail-size quarantine.
Yeah, I guess not much I may do about it. However, just to be on the safe side I did CC it to Tom directly individually just to make sure he has it (;-p).
Cheers
Marcel
Quoted 17 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
The device trees were taken straight from Linux v6.5-rc1.
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE
---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)Signed-off-by Marcel Ziswiler <[email protected]>---
[...]
Quoted 6 lines
doc/board/toradex/verdin-am62.rst new file +0
-0
doc/board/toradex/verdin-am62.rst line 8
Quoted 8 lines
doc/board/toradex/verdin-am62.rst new file +8
-0@@ -0,0 +1,130 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. sectionauthor:: Marcel Ziswiler <[email protected]> + +Verdin AM62 Module +================== + +Quick Start +-----------
I'd leave a product link here:
Something likeSoM <https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62>_
Dev board <https://www.toradex.com/products/carrier-board/verdin-development-board-kit>
or something like that.
Quoted 46 lines
doc/board/toradex/verdin-am62.rst new file +46
-0+Output: + +.. code-block:: bash + +U-Boot SPL 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:14 +0200) +SYSFW ABI: 3.1 (firmware rev 0x0009 '9.0.1--v09.00.01 (Kool Koala)') +SPL initial stack usage: 13368 bytes +Trying to boot from MMC1 +Authentication passed +Authentication passed +Authentication passed +Authentication passed +Authentication passed +Starting ATF on ARM64 core... + +NOTICE: BL31: v2.9(release):v2.9.0-73-g463655cc8 +NOTICE: BL31: Built : 14:51:42, Jun 5 2023 +I/TC: +I/TC: OP-TEE version: 3.21.0-168-g322cf9e33 (gcc version 12.2.1 20221205 (Arm GNU Toolchain 12.2.Rel1 (Build arm-12.24))) #2 Mon Jun 5 13:04:15 UTC 2023 aarch64 +I/TC: WARNING: This OP-TEE configuration might be insecure! +I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html +I/TC: Primary CPU initializing +I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.0.1--v09.00.01 (Kool Koala)') +I/TC: HUK Initialized +I/TC: Primary CPU switching to normal world boot + +U-Boot SPL 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:41 +0200) +SYSFW ABI: 3.1 (firmware rev 0x0009 '9.0.1--v09.00.01 (Kool Koala)') +SPL initial stack usage: 1840 bytes +Trying to boot from MMC1 +Authentication passed +Authentication passed + + +U-Boot 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:41 +0200) + +SoC: AM62X SR1.0 HS-FS +DRAM: 2 GiB +Core: 136 devices, 28 uclasses, devicetree: separate +MMC: mmc@fa10000: 0, mmc@fa00000: 1 +Loading Environment from MMC... OK +In: serial@2800000 +Out: serial@2800000 +Err: serial@2800000 +Model: Toradex 0076 Verdin AM62 Quad 2GB WB IT V1.0A +Serial#: 15037380
doc/board/toradex/verdin-am62.rst line 130
Quoted 10 lines
doc/board/toradex/verdin-am62.rst new file +10
-0+Carrier: Toradex Verdin Development Board V1.1A, Serial# 10754333 +am65_cpsw_nuss ethernet@8000000: K3 CPSW: nuss_ver: 0x6BA01103 cpsw_ver: 0x6BA81103 ale_ver: 0x00290105 Ports:2 mdio_freq:1000000 +Setting variant to wifi +Net: +Warning: ethernet@8000000port@1 MAC addresses don't match: +Address in ROM is 1c:63:49:22:5f:f9 +Address in environment is 00:14:2d:e5:73:c4 +eth0: ethernet@8000000port@1 [PRIME], eth1: ethernet@8000000port@2 +Hit any key to stop autoboot: 0 +Verdin AM62 #
I think you missed adding white space here.
It renders as this: https://usercontent.irccloud-cdn.com/file/625Dsdcq/image.png
With that fixed, please feel free to add:
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Quoted 47 lines · Nishanth Menon
Quoted 17 lines · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
This adds initial support for the Toradex Verdin AM62 Quad 1GB WB IT V1.0A module and subsequent V1.1 launch configuration SKUs. They are strapped to boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, DFU support is disabled for now due to missing AM62x USB support.
The device trees were taken straight from Linux v6.5-rc1.
Boot sequence is:
SYSFW ---> R5 SPL (both in tiboot3.bin) ---> ATF (TF-A) ---> OP-TEE
---> A53 SPL (part of tispl.bin) ---> U-boot proper (u-boot.img)Signed-off-by Marcel Ziswiler <[email protected]>---
[...]
Quoted 6 lines
doc/board/toradex/verdin-am62.rst new file +0
-0doc/board/toradex/verdin-am62.rst line 8
Quoted 8 lines
doc/board/toradex/verdin-am62.rst new file +8
-0@@ -0,0 +1,130 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. sectionauthor:: Marcel Ziswiler <[email protected]> + +Verdin AM62 Module +================== + +Quick Start +-----------I'd leave a product link here:
Something like
SoM <https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62>_
Dev board <https://www.toradex.com/products/carrier-board/verdin-development-board-kit>or something like that.
Quoted 3 lines
doc/board/toradex/verdin-am62.rst new file +3
-0+Output: + +.. code-block:: bash
[snip]
Quoted 3 lines
I think you missed adding white space here.
It renders as this: https://usercontent.irccloud-cdn.com/file/625Dsdcq/image.png
This is how all of the verdin boot logs render, and are all wrong. It should instead be:
Output::
U-Boot SPL 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:14 +0200)
...
And I think we can take both of these as a follow-up patch that Heinrich will take and pass along before v2023.10 is out.
Signature · 1 line
Tom
On 14:35-20230804, Tom Rini wrote:
[..]
Quoted 11 lines
Quoted 3 lines
Quoted 3 lines
doc/board/toradex/verdin-am62.rst new file +3
-0+Output: + +.. code-block:: bash[snip]
Quoted 3 lines
I think you missed adding white space here.
It renders as this: https://usercontent.irccloud-cdn.com/file/625Dsdcq/image.png
This is how all of the verdin boot logs render, and are all wrong. It should instead be:
Quoted 7 lines
Output::
U-Boot SPL 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:14 +0200)
...And I think we can take both of these as a follow-up patch that Heinrich will take and pass along before v2023.10 is out.
yup, I am good with that (Marcel, I assume you will send a follow on fix up patch). Thanks.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Quoted 15 lines · Nishanth Menon
On 14:35-20230804, Tom Rini wrote:
[..]Quoted 13 lines
Quoted 3 lines
Quoted 3 lines
doc/board/toradex/verdin-am62.rst new file +3
-0+Output: + +.. code-block:: bash[snip]
Quoted 3 lines
I think you missed adding white space here.
It renders as this: https://usercontent.irccloud-cdn.com/file/625Dsdcq/image.png
This is how all of the verdin boot logs render, and are all wrong. It should instead be:
Output::
Quoted 13 lines
Quoted 5 lines
U-Boot SPL 2023.10-rc1-00210-gb678170a34c (Aug 03 2023 - 00:09:14 +0200)
...And I think we can take both of these as a follow-up patch that Heinrich will take and pass along before v2023.10 is out.
yup, I am good with that (Marcel, I assume you will send a follow on fix up patch). Thanks.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Yes, don't worry and thanks for all the valuable feedback.
Cheers
Marcel