diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-06-16 16:13:08 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-06-16 16:51:15 +0200 |
| commit | 1758570639a6bd53e968808a624db532ad905c4b (patch) | |
| tree | 367a5097e22203c70bb41ba76ae7ab0973990254 | |
| parent | d0a67d4a4d2e04dbfa2c69066599d7e939cff175 (diff) | |
toradex: tdx-cfg-block: add verdin am62 launch configuration SKUs
Add Verdin am62 SKUs to ConfigBlock handling.
Add the following PID4s SOMs:
- 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
to the list of Toradex modules
Upstream-Status: Pending
Series [1] already sent for review and this patch must be applied on top,
fixing trivial conflicts.
We'll send afterward or update it in case a V3 is needed.
[1] https://lore.kernel.org/u-boot/20230612205444.363727-1-marcel@ziswiler.com/
Related-to: ELB-5222
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 6 | ||||
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.h | 7 | ||||
| -rw-r--r-- | board/toradex/verdin-am62/verdin-am62.c | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 07f6f83c37..78acab85b8 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -137,6 +137,12 @@ const struct toradex_som toradex_modules[] = { [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) }, + [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[] = { diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index 405a25acda..c51f2ca934 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -95,6 +95,13 @@ enum { APALIS_IMX8QM_8GB_WIFI_BT_IT, VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN, VERDIN_AM62Q_WIFI_BT_IT, + /* 70 */ + VERDIN_AM62S_512MB = 71, + 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 { diff --git a/board/toradex/verdin-am62/verdin-am62.c b/board/toradex/verdin-am62/verdin-am62.c index 5cb26f4899..1821e3841c 100644 --- a/board/toradex/verdin-am62/verdin-am62.c +++ b/board/toradex/verdin-am62/verdin-am62.c @@ -83,7 +83,10 @@ static void select_dt_from_module_version(void) * If we have a valid config block and it says we are a module with * Wi-Fi/Bluetooth make sure we use the -wifi device tree. */ - is_wifi = (tdx_hw_tag.prodid == VERDIN_AM62Q_WIFI_BT_IT); + is_wifi = (tdx_hw_tag.prodid == VERDIN_AM62Q_WIFI_BT_IT) || + (tdx_hw_tag.prodid == VERDIN_AM62S_512MB_WIFI_BT_IT) || + (tdx_hw_tag.prodid == VERDIN_AM62D_1G_WIFI_BT_IT) || + (tdx_hw_tag.prodid == VERDIN_AM62Q_2G_WIFI_BT_IT); } if (is_wifi) |