board: toradex: add verdin am62 support
v4 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. And last but not least support for the Toradex Verdin AM62 is added.
[1] https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62
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 (3):
toradex: tdx-cfg-block: add verdin am62 skus
arm: mach-k3: am62: fix 2nd mux option of clkout0
board: toradex: add verdin am62 support
arch/arm/dts/Makefile | 4 +- arch/arm/dts/k3-am62-verdin-dev.dtsi | 192 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1405 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 116 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 570 +++++ .../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 + 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/toradex/verdin-am62.rst | 169 ++ include/configs/verdin-am62.h | 55 + 25 files changed, 7030 insertions(+), 5 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 v4 1/3 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
PATCH v4 2/3 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
PATCH v4 3/3 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.
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 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 | 192 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1405 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 116 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 570 +++++ .../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/toradex/verdin-am62.rst | 169 ++ include/configs/verdin-am62.h | 55 + 22 files changed, 7012 insertions(+), 1 deletion(-) 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
@@ -1311,7 +1311,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 +192 -0
192 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 +1405 -0
1,405 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi new file +2190 -0
1,354 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-r5.dts new file +116 -0
116 lines not on this page · raw message
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +570 -0
570 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 +169 -0
169 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.
Quoted 11 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.
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)
Please state the dts is from v6.5-rc1 - this is to ensure we can track over time the updates needed - typically we want to get to a place where we can update in one shot to stay in sync.
just a side note: we might want to see how to get those eeproms merged in for kernel (we'd really like to get rid of u-boot.dtsi)
Also drop #include "k3-am625-verdin-wifi-dev-binman.dtsi" from r5.dts (you already get it from u-boot.dtsi)
you also dont need the memory@, reserved-memory sa_secproxy, esm etc in r5.dts - please see am62-r5-sk.dts to see how it is done. all of these are now inherited from SoC.dtsi or board.dts.. (yaay - your r5.dts is going to be much tinier once you clean that up)..
Quoted 5 lines
Signed-off-by Marcel Ziswiler <[email protected]>---
[...]
Marcel, copying the files from v6.5-rc1, I see the following deltas
we try to migrate the dts files as is.. so trying to understand the #if 0 here. Just disabling the driver in defconfig should get the feature out, correct?
I suspect some debuggy stuff creeped in perhaps?
arch/arm/dts/k3-am62-verdin-dev.dtsi +0 -2
@@ -160,7 +160,6 @@ status = "okay"; }; -#if 0 /* Verdin USB_1 */ &usbss0 { status = "okay";
@@ -178,7 +177,6 @@ &usb1 { status = "okay"; }; -#endif /* Verdin CTRL_WAKE1_MICO# */ &verdin_gpio_keys {
arch/arm/dts/k3-am62-verdin.dtsi +0 -4
@@ -36,10 +36,8 @@ serial2 = &main_uart0; serial3 = &mcu_uart0; serial4 = &main_uart5; -#if 0 usb0 = &usb0; usb1 = &usb1; -#endif }; verdin_gpio_keys: gpio-keys {
@@ -1369,7 +1367,6 @@ status = "disabled"; }; -#if 0 /* Verdin USB_1 */ &usbss0 { ti,vbus-divider;
@@ -1395,7 +1392,6 @@ dr_mode = "host"; status = "disabled"; }; -#endif /* Verdin UART_2 */ &wkup_uart0 {
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Hi Nishanth
Quoted 9 lines · Nishanth Menon
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
Quoted 3 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)Please state the dts is from v6.5-rc1 - this is to ensure we can track over time the updates needed - typically we want to get to a place where we can update in one shot to stay in sync.
I did, but only in the change log. Let me add it to the commit message as well.
Quoted 2 lines
just a side note: we might want to see how to get those eeproms merged in for kernel (we'd really like to get rid of
u-boot.dtsi)
Yes, one may dream...
Quoted 2 lines
Also drop #include "
k3-am625-verdin-wifi-dev-binman.dtsi" fromr5.dts(you already get it fromu-boot.dtsi)
Okay.
Quoted 4 lines
you also dont need the memory@, reserved-memory
sa_secproxy, esm etc inr5.dts- please seeam62-r5-sk.dtsto see how it is done. all of these are now inherited fromSoC.dtsiorboard.dts.. (yaay - yourr5.dtsis going to be much tinier once you clean that up)..
I guess I missed that recent change. Thanks!
Quoted 7 lines
Quoted 4 lines
Signed-off-by Marcel Ziswiler <[email protected]>---
[...]
Quoted 7 lines
Marcel, copying the files from v6.5-rc1, I see the following deltas
we try to migrate the dts files as is.. so trying to understand the #if 0 here. Just disabling the driver in defconfig should get the feature out, correct?
I suspect some debuggy stuff creeped in perhaps?
No, USB support is not there yet and this used to fail. I actually still do have a series on top adding USB support and dropped those there, but yeah, now with the synced stuff I may drop those here already. Thanks!
Quoted 48 lines
arch/arm/dts/k3-am62-verdin-dev.dtsi +0
-0@@ -160,7 +160,6 @@ status = "okay"; };
-#if 0
/* VerdinUSB_1*/
&usbss0 {
status = "okay";arch/arm/dts/k3-am62-verdin-dev.dtsi +0
-1@@ -178,7 +177,6 @@ &usb1 { status = "okay"; }; -#endif
/* Verdin CTRL_WAKE1_MICO# */
&verdin_gpio_keys {arch/arm/dts/k3-am62-verdin.dtsi +0
-2@@ -36,10 +36,8 @@ serial2 = &main_uart0; serial3 = &mcu_uart0; serial4 = &main_uart5; -#if 0 usb0 = &usb0; usb1 = &usb1; -#endif };
verdin_gpio_keys: gpio-keys {arch/arm/dts/k3-am62-verdin.dtsi +0
-0@@ -1369,7 +1367,6 @@ status = "disabled"; };
-#if 0
/* VerdinUSB_1*/
&usbss0 {
ti,vbus-divider;arch/arm/dts/k3-am62-verdin.dtsi +0
-1@@ -1395,7 +1392,6 @@ dr_mode = "host"; status = "disabled"; }; -#endif
Quoted 3 lines
/* VerdinUART_2*/
&wkup_uart0 {
Cheers
Marcel
Quoted 1 line · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
[...]
Quoted 24 lines
doc/board/toradex/verdin-am62.rst new file +18
-0@@ -0,0 +1,169 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. sectionauthor:: Marcel Ziswiler <[email protected]> + +Verdin AM62 Module +================== + +Quick Start +----------- + +- Get the binary-only SYSFW +- Get binary-only TI Linux firmware +- Build the ARM trusted firmware binary +- Build the OPTEE binary +- Build U-Boot for the R5 +- Build U-Boot for the A53 +- Flash to eMMC +- Boot +
doc/board/toradex/verdin-am62.rst line 28
Quoted 10 lines
doc/board/toradex/verdin-am62.rst new file +10
-0+For an overview of the TI AM62 SoC boot flow please head over to: +.. file:: ../ti/am62x_sk.rst + +Get the SYSFW +------------- + +.. code-block:: bash + + $ echo "Downloading SYSFW..." + $ git clone git://git.ti.com/k3-image-gen/k3-image-gen.git
we dont need k3-image-gen anymore..
doc/board/toradex/verdin-am62.rst line 31
Quoted 3 lines
doc/board/toradex/verdin-am62.rst new file +3
-0+ +Get the TI Linux Firmware +-------------
Umm..
https://u-boot.readthedocs.io/en/latest/build/documentation.html?highlight=htmldocs#html-documentation
make htmldocs:
u-boot/doc/board/toradex/verdin-am62.rst:31:Title underline too short.
If you like, please consider the following diff to your changes - as I had setup am62x doc to be a bit re-usable to help keep things sane and central:
doc/board/ti/am62x_sk.rst +8 -8
@@ -54,7 +54,7 @@ Below is the pictorial representation of boot flow: Sources: -------- -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_boot_sources :end-before: .. k3_rst_include_end_boot_sources
@@ -62,17 +62,17 @@ Build procedure: ---------------- 0. Setup the environment variables: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_common_env_vars_desc :end-before: .. k3_rst_include_end_common_env_vars_desc -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_board_env_vars_desc :end-before: .. k3_rst_include_end_board_env_vars_desc Set the variables corresponding to this platform: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_common_env_vars_defn :end-before: .. k3_rst_include_end_common_env_vars_defn .. code-block:: bash
@@ -89,14 +89,14 @@ Set the variables corresponding to this platform: 1. Trusted Firmware-A: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_build_steps_tfa :end-before: .. k3_rst_include_end_build_steps_tfa 2. OP-TEE: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_build_steps_optee :end-before: .. k3_rst_include_end_build_steps_optee
@@ -104,13 +104,13 @@ Set the variables corresponding to this platform: * 4.1 R5: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_build_steps_spl_r5 :end-before: .. k3_rst_include_end_build_steps_spl_r5 * 4.2 A53: -.. include:: k3.rst +.. include:: ../ti/k3.rst :start-after: .. k3_rst_include_start_build_steps_uboot :end-before: .. k3_rst_include_end_build_steps_uboot .. am62x_evm_rst_include_end_build_steps
doc/board/ti/k3.rst +1 -0
@@ -31,6 +31,7 @@ K3 Based SoCs :maxdepth: 1 am62x_sk + ../toradex/verdin-am62 am64x_evm am65x_evm j7200_evm
doc/board/toradex/index.rst +1 -0
@@ -11,3 +11,4 @@ Toradex colibri-imx8x verdin-imx8mm verdin-imx8mp + verdin-am62
doc/board/toradex/verdin-am62.rst +30 -65
109 lines not on this page · raw message
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Hi Nishanth
Quoted 32 lines · Nishanth Menon
Quoted 1 line · Marcel Ziswiler
From: Marcel Ziswiler <[email protected]>
[...]
Quoted 28 lines
doc/board/toradex/verdin-am62.rst new file +22
-0@@ -0,0 +1,169 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. sectionauthor:: Marcel Ziswiler <[email protected]> + +Verdin AM62 Module +================== + +Quick Start +----------- + +- Get the binary-only SYSFW +- Get binary-only TI Linux firmware +- Build the ARM trusted firmware binary +- Build the OPTEE binary +- Build U-Boot for the R5 +- Build U-Boot for the A53 +- Flash to eMMC +- Boot + +For an overview of the TI AM62 SoC boot flow please head over to: +.. file:: ../ti/am62x_sk.rst + +Get the SYSFW
Quoted 8 lines
doc/board/toradex/verdin-am62.rst line 28
Quoted 6 lines
doc/board/toradex/verdin-am62.rst new file +6
-0+------------- + +.. code-block:: bash + + $ echo "Downloading SYSFW..." + $ git clone git://git.ti.com/k3-image-gen/k3-image-gen.gitwe dont need k3-image-gen anymore..
Yes, true.
Quoted 8 lines
doc/board/toradex/verdin-am62.rst line 31
Quoted 3 lines
doc/board/toradex/verdin-am62.rst new file +3
-0+ +Get the TI Linux Firmware +-------------Umm..
https://u-boot.readthedocs.io/en/latest/build/documentation.html?highlight=htmldocs#html-documentation
make htmldocs:
u-boot/doc/board/toradex/verdin-am62.rst:31:Title underline too short.
Yes, Emanuele already spotted that trying to run Azure CI earlier today.
Quoted 3 lines
If you like, please consider the following diff to your changes - as I had setup am62x doc to be a bit re-usable to help keep things sane and central:
Cool, thanks. I applied this, run Azure CI on it [1] and sent a v5 [2].
Thanks again!
Quoted 194 lines
doc/board/ti/am62x_sk.rst +0
-0@@ -54,7 +54,7 @@ Below is the pictorial representation of boot flow:Sources:
--------
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_boot_sources:end-before: ..k3_rst_include_end_boot_sourcesdoc/board/ti/am62x_sk.rst +0
-0@@ -62,17 +62,17 @@ Build procedure:----------------
0. Setup the environment variables:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_common_env_vars_desc:end-before: ..k3_rst_include_end_common_env_vars_desc
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_board_env_vars_desc:end-before: ..k3_rst_include_end_board_env_vars_desc
Set the variables corresponding to this platform:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_common_env_vars_defn:end-before: ..k3_rst_include_end_common_env_vars_defn.. code-block:: bashdoc/board/ti/am62x_sk.rst +0
-0@@ -89,14 +89,14 @@ Set the variables corresponding to this platform:
1. Trusted Firmware-A:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_build_steps_tfa:end-before: ..k3_rst_include_end_build_steps_tfa
2. OP-TEE:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_build_steps_optee:end-before: ..k3_rst_include_end_build_steps_opteedoc/board/ti/am62x_sk.rst +0
-0@@ -104,13 +104,13 @@ Set the variables corresponding to this platform:
* 4.1 R5:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_build_steps_spl_r5:end-before: ..k3_rst_include_end_build_steps_spl_r5
* 4.2 A53:
-.. include::k3.rst
+.. include::../ti/k3.rst
:start-after: ..k3_rst_include_start_build_steps_uboot:end-before: ..k3_rst_include_end_build_steps_uboot..am62x_evm_rst_include_end_build_stepsdoc/board/ti/k3.rst +0
-0@@ -31,6 +31,7 @@ K3 Based SoCs:maxdepth: 1
am62x_sk
+ ../toradex/verdin-am62
am64x_evm
am65x_evm
j7200_evmdoc/board/toradex/index.rst +0
-0@@ -11,3 +11,4 @@ Toradexcolibri-imx8x
verdin-imx8mm
verdin-imx8mp
+ verdin-am62doc/board/toradex/verdin-am62.rst +0
-0@@ -17,79 +17,44 @@ Quick Start- Boot
For an overview of the TI AM62 SoC boot flow please head over to:
-.. file::../ti/am62x_sk.rst
+:doc:../ti/am62x_skdoc/board/toradex/verdin-am62.rst +5
-24-Get the SYSFW -------------- - -.. code-block:: bash - - $ echo "Downloading SYSFW..." - $ git clone git://git.ti.com/k3-image-gen/k3-image-gen.git - -Get the TI Linux Firmware -------------- - -.. code-block:: bash - - $ echo "Downloading TI Linux Firmware..." - $ git clone -b ti-linux-firmware git://git.ti.com/processor-firmware/ti-linux-firmware.git - -Get and Build the ARM Trusted Firmware (Trusted Firmware A) ------------------------------------------------------------ - -.. code-block:: bash - - $ echo "Downloading and building TF-A..." - $ git clone https://github.com/ARM-software/arm-trusted-firmware.git - $ cd arm-trusted-firmware +Sources: +-------- +.. include:: ../ti/k3.rst + :start-after: .. k3_rst_include_start_boot_sources + :end-before: .. k3_rst_include_end_boot_sourcesdoc/board/toradex/verdin-am62.rst +3
-1-Then build ATF (TF-A): +Build procedure: +---------------- +0. Setup the environment variables:
-.. code-block:: bashdoc/board/toradex/verdin-am62.rst +3
-26- - $ export ARCH=aarch64 - $ export CROSS_COMPILE=aarch64-none-linux-gnu- - $ make PLAT=k3 TARGET_BOARD=lite SPD=opteed - -Get and Build OPTEE -------------------- - -.. code-block:: bash - - $ echo "Downloading and building OPTEE..." - $ git clone https://github.com/OP-TEE/optee_os.git - $ cd optee_os - -Then build OPTEE: - -.. code-block:: bash - - $ export CROSS_COMPILE=arm-none-linux-gnueabihf- - $ export CROSS_COMPILE64=aarch64-none-linux-gnu- - $ make PLATFORM=k3 CFG_ARM64_core=y - -Build U-Boot for R5 -------------------- - -.. code-block:: bash +.. include:: ../ti/k3.rst + :start-after: .. k3_rst_include_start_common_env_vars_desc + :end-before: .. k3_rst_include_end_common_env_vars_desc
- $ export ARCH=arm
- $ export CROSS_COMPILE=arm-none-linux-gnueabihf- - $ make verdin-am62_r5_defconfig
- $ make BINMAN_INDIRS=<path/to/ti-linux-firmware> +.. include::../ti/k3.rst
+ :start-after: ..k3_rst_include_start_board_env_vars_desc+ :end-before: ..k3_rst_include_end_board_env_vars_descdoc/board/toradex/verdin-am62.rst +1
-2-Build U-Boot for A53 --------------------- +Set the variables corresponding to this platform:
+.. include::../ti/k3.rst
+ :start-after: ..k3_rst_include_start_common_env_vars_defn+ :end-before: ..k3_rst_include_end_common_env_vars_defn
.. code-block:: bash
- $ export ARCH=arm64
- $ export CROSS_COMPILE=aarch64-none-linux-gnu-
- $ make verdin-am62_a53_defconfig
- $ make BL31=<path to ATF dir>/build/k3/lite/release/bl31.bin \
- TEE=<path to OPTEE OS dir>/out/arm-plat-k3/core/tee-pager_v2.bin \
- BINMAN_INDIRS=<path/to/ti-linux-firmware>
+ $ export UBOOT_CFG_CORTEXR=verdin-am62_r5_defconfig
+ $ export UBOOT_CFG_CORTEXA=verdin-am62_a53_defconfig
+ $ export TFA_BOARD=lite
+ $ # we dont use any extra TFA parameters
+ $ unsetTFA_EXTRA_ARGS
+ $ export OPTEE_PLATFORM=k3-am62x
Quoted 8 lines
+ $ export OPTEE_EXTRA_ARGS="CFG_WITH_SOFTWARE_PRNG=y" +
+.. include::../ti/am62x_sk.rst
+ :start-after: ..am62x_evm_rst_include_start_build_steps+ :end-before: ..am62x_evm_rst_include_end_build_steps
Flash to eMMC
-------------
[1] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=6792&view=results
[2] https://lore.kernel.org/all/[email protected]
Cheers
Marcel
Hi Marcel
Quoted 15 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.
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 111 lines
arch/arm/dts/k3-am625-verdin-r5.dts new file +4
-0+ mbox-names = "rx", "tx", "notify"; + ti,host-id = <35>; + ti,secure-host; +};arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +101
-0@@ -0,0 +1,570 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2023 Toradex + */ + +#include "k3-binman.dtsi" + +&binman { + custMpk { + filename = "custMpk.pem"; + blob-ext { + filename = "../../ti/keys/custMpk.pem"; + }; + }; + + ti-degenerate-key { + filename = "ti-degenerate-key.pem"; + blob-ext { + filename = "../../ti/keys/ti-degenerate-key.pem"; + }; + }; +}; + +#ifndef CONFIG_ARM64 + +&binman { + board-cfg { + filename = "board-cfg.bin"; + bcfg_yaml: ti-board-config { + config = "board-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + pm-cfg { + filename = "pm-cfg.bin"; + rcfg_yaml: ti-board-config { + config = "pm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + rm-cfg { + filename = "rm-cfg.bin"; + pcfg_yaml: ti-board-config { + config = "rm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + sec-cfg { + filename = "sec-cfg.bin"; + scfg_yaml: ti-board-config { + config = "sec-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + combined-tifs-cfg { + filename = "combined-tifs-cfg.bin"; + ti-board-config { + bcfg_yaml_tifs: board-cfg { + config = "board-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + scfg_yaml_tifs: sec-cfg { + config = "sec-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + pcfg_yaml_tifs: pm-cfg { + config = "pm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + rcfg_yaml_tifs: rm-cfg { + config = "rm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + }; + combined-dm-cfg { + filename = "combined-dm-cfg.bin"; + ti-board-config { + pcfg_yaml_dm: pm-cfg { + config = "pm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + rcfg_yaml_dm: rm-cfg { + config = "rm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + }; + combined-sysfw-cfg { + filename = "combined-sysfw-cfg.bin"; + ti-board-config { + board-cfg { + config = "board-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + sec-cfg { + config = "sec-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + pm-cfg { + config = "pm-cfg.yaml";
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi line 111
Quoted 10 lines
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +10
-0+ schema = "../../ti/common/schema.yaml"; + }; + rm-cfg { + config = "rm-cfg.yaml"; + schema = "../../ti/common/schema.yaml"; + }; + }; + }; +}; +
^ If you are already including k3-binman.dtsi, why are you redefining these?
Quoted 10 lines
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +10
-0+#endif /* CONFIG_ARM64 */ + +#ifdef CONFIG_TARGET_VERDIN_AM62_R5 + +&binman { + tiboot3-am62x-hs-verdin.bin { + filename = "tiboot3-am62x-hs-verdin.bin"; + ti-secure-rom { + content = <&u_boot_spl>, <&ti_fs_enc>, <&combined_tifs_cfg>, + <&combined_dm_cfg>, <&sysfw_inner_cert>;
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi line 131
Quoted 10 lines
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +10
-0+ combined; + dm-data; + sysfw-inner-cert; + keyfile = "custMpk.pem"; + sw-rev = <1>; + content-sbl = <&u_boot_spl>; + content-sysfw = <&ti_fs_enc>; + content-sysfw-data = <&combined_tifs_cfg>; + content-sysfw-inner-cert = <&sysfw_inner_cert>; + content-dm-data = <&combined_dm_cfg>;
If the R5 builds are exactly the same as that generated by k3-am625-binman.dtsi, would it make sense to include that file and just replace the filenames using phandles?
Quoted 22 lines
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi new file +12
-0+ conf-0 { + description = "k3-am625-verdin-wifi-dev"; + firmware = "uboot"; + loadables = "uboot"; + fdt = "fdt-0"; + }; + }; + }; + }; +}; + +#endif /* CONFIG_TARGET_VERDIN_AM62_A53 */arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi new file +4
-0@@ -0,0 +1,201 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright 2023 Toradex + */
[...]
arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
Quoted 6 lines
+ */
arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi new file +5
-0+ +#ifndef __VERDIN_AM62_H +#define __VERDIN_AM62_H + +#define RAMDISK_ADDR_R 0x90300000
Nitpick: indentation
Quoted 44 lines
arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi new file +44
-0+#define SCRIPTADDR 0x90280000 + +/* DDR Configuration */ +#define CFG_SYS_SDRAM_BASE 0x80000000 +#define CFG_SYS_SDRAM_BASE1 0x880000000 +#define CFG_SYS_SDRAM_SIZE SZ_2G /* Maximum supported size */ + +#define MEM_LAYOUT_ENV_SETTINGS \ + "fdt_addr_r=0x90200000\0" \ + "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "kernel_comp_addr_r=0x80200000\0" \ + "kernel_comp_size=0x08000000\0" \ + "ramdisk_addr_r=" __stringify(RAMDISK_ADDR_R) "\0" \ + "scriptaddr=" __stringify(SCRIPTADDR) "\0" + +#if CONFIG_TARGET_VERDIN_AM62_A53 +/* Enable Distro Boot */ +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + func(DHCP, dhcp, na) +#include <config_distro_bootcmd.h> +#else /* CONFIG_TARGET_VERDIN_AM62_A53 */ +#define BOOTENV \ + "" +#endif /* CONFIG_TARGET_VERDIN_AM62_A53 */ + +/* Incorporate settings into the U-Boot environment */ +#define CFG_EXTRA_ENV_SETTINGS \ + BOOTENV \ + MEM_LAYOUT_ENV_SETTINGS \ + "boot_scripts=boot.scr\0" \ + "boot_script_dhcp=boot.scr\0" \ + "console=ttyS2\0" \ + "fdt_board=dev\0" \ + "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ + "consoleblank=0 earlycon=ns16550a,mmio32,0x02800000\0" \ + "update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \ + "if test \"$confirm\" = \"y\"; then " \ + "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ + "${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \ + "${blkcnt}; fi\0" + +#endif /* __VERDIN_AM62_H */
Signature · 2 lines
Thanking You Neha Malcom Francis
I'm not responsible for k3, so do not send me these emails.
Quoted 109 lines · On Friday 28 July 2023 22:54:53 Marcel Ziswiler wrote:
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. And last but not least support for the Toradex Verdin AM62 is added.
[1] https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62
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.
- Enableof_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 ofmain_bcdmaandmain_pktdmaas 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.
- EnableCONFIG_TI_SECURE_DEVICEby 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 enableCONFIG_SPL_MMC_HS200_SUPPORTin R5 SPL.
- EnableCONFIG_LEGACY_IMAGE_FORMATto allow sourcing unsigned script images e.g. like our current boot scripts.
- IncreaseCONFIG_SYS_BOOTM_LENto 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.
- IncreaseCONFIG_SYS_MAXARGSfrom default 16 to 64.
- EnableCONFIG_CMD_REMOTEPROC,CONFIG_SPL_DM_GPIO_LOOKUP_LABELandCONFIG_SPL_I2C_EEPROM.
- For R5 SPL increaseCONFIG_SPL_STACK_R_MALLOC_SIMPLE_LENto0x140000, enableCONFIG_SPL_I2C,CONFIG_DM_I2CandCONFIG_SYS_I2C_OMAP24XXand savedefconfig got rid ofCONFIG_SPL_FIT_IMAGE_POST_PROCESS.Marcel Ziswiler (3):
toradex: tdx-cfg-block: add verdin am62 skus
arm: mach-k3: am62: fix 2nd mux option of clkout0
board: toradex: add verdin am62 supportarch/arm/dts/Makefile | 4 +- arch/arm/dts/k3-am62-verdin-dev.dtsi | 192 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1405 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 116 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 570 +++++ .../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 + 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/toradex/verdin-am62.rst | 169 ++ include/configs/verdin-am62.h | 55 + 25 files changed, 7030 insertions(+), 5 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.hSignature · 1 line
2.36.1
Sorry about that. Looks like patman somehow choose you. I will add a rule to no longer do that. Thanks!
Quoted 112 lines · Pali Rohár
I'm not responsible for k3, so do not send me these emails.
Quoted 109 lines · On Friday 28 July 2023 22:54:53 Marcel Ziswiler wrote:
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. And last but not least support for the Toradex Verdin AM62 is added.
[1] https://www.toradex.com/computer-on-modules/verdin-arm-family/ti-am62
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.
- Enableof_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 ofmain_bcdmaandmain_pktdmaas 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.
- EnableCONFIG_TI_SECURE_DEVICEby 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 enableCONFIG_SPL_MMC_HS200_SUPPORTin R5 SPL.
- EnableCONFIG_LEGACY_IMAGE_FORMATto allow sourcing unsigned script images e.g. like our current boot scripts.
- IncreaseCONFIG_SYS_BOOTM_LENto 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.
- IncreaseCONFIG_SYS_MAXARGSfrom default 16 to 64.
- EnableCONFIG_CMD_REMOTEPROC,CONFIG_SPL_DM_GPIO_LOOKUP_LABELandCONFIG_SPL_I2C_EEPROM.
- For R5 SPL increaseCONFIG_SPL_STACK_R_MALLOC_SIMPLE_LENto0x140000, enableCONFIG_SPL_I2C,CONFIG_DM_I2CandCONFIG_SYS_I2C_OMAP24XXand savedefconfig got rid ofCONFIG_SPL_FIT_IMAGE_POST_PROCESS.Marcel Ziswiler (3):
toradex: tdx-cfg-block: add verdin am62 skus
arm: mach-k3: am62: fix 2nd mux option of clkout0
board: toradex: add verdin am62 supportarch/arm/dts/Makefile | 4 +- arch/arm/dts/k3-am62-verdin-dev.dtsi | 192 ++ arch/arm/dts/k3-am62-verdin-wifi.dtsi | 39 + arch/arm/dts/k3-am62-verdin.dtsi | 1405 +++++++++++ .../dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2190 +++++++++++++++++ arch/arm/dts/k3-am625-verdin-r5.dts | 116 + .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 570 +++++ .../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 + 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/toradex/verdin-am62.rst | 169 ++ include/configs/verdin-am62.h | 55 + 25 files changed, 7030 insertions(+), 5 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.hSignature · 1 line
2.36.1
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.