dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

toradex: tdx-cfg-block: add Verdin iMX8M Mini/Nano support

Browse Source 
Add support for storing configuration for Verdin iMX8M Mini and
Nano SoMs in Toradex config block.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
This commit is contained in:
Marcel Ziswiler
2020-01-28 14:42:24 +01:00
committed by Stefano Babic
parent 842ddf8eb5
commit c0c3978cba
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
board/toradex/common/tdx-cfg-block.c
View File

@@ -10,7 +10,9 @@
defined(CONFIG_TARGET_APALIS_IMX8) || \ defined(CONFIG_TARGET_APALIS_IMX8) || \
defined(CONFIG_TARGET_APALIS_IMX8X) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \
defined(CONFIG_TARGET_COLIBRI_IMX6) || \ defined(CONFIG_TARGET_COLIBRI_IMX6) || \
defined(CONFIG_TARGET_COLIBRI_IMX8X) defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
defined(CONFIG_TARGET_VERDIN_IMX8MN)
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#else #else
#define is_cpu_type(cpu) (0) #define is_cpu_type(cpu) (0)
@@ -115,6 +117,9 @@ const char * const toradex_modules[] = {
[52] = "Colibri iMX8 DualX 1GB", [52] = "Colibri iMX8 DualX 1GB",
[53] = "Apalis iMX8 QuadXPlus 2GB ECC IT", [53] = "Apalis iMX8 QuadXPlus 2GB ECC IT",
[54] = "Apalis iMX8 DualXPlus 1GB", [54] = "Apalis iMX8 DualXPlus 1GB",
[55] = "Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT",
[56] = "Verdin iMX8M Nano SoloLite 1GB", /* not currently on sale */
[57] = "Verdin iMX8M Mini DualLite 1GB",
}; };
#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC
@@ -297,17 +302,24 @@ static int get_cfgblock_interactive(void)
char *soc; char *soc;
char it = 'n'; char it = 'n';
char wb = 'n'; char wb = 'n';
int len; int len = 0;
/* Unknown module by default */ /* Unknown module by default */
tdx_hw_tag.prodid = 0; tdx_hw_tag.prodid = 0;
if (cpu_is_pxa27x()) if (cpu_is_pxa27x())
sprintf(message, "Is the module the 312 MHz version? [y/N] "); sprintf(message, "Is the module the 312 MHz version? [y/N] ");
#if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN)
else else
sprintf(message, "Is the module an IT version? [y/N] "); sprintf(message, "Is the module an IT version? [y/N] ");
len = cli_readline(message); len = cli_readline(message);
it = console_buffer[0]; it = console_buffer[0];
#else
else
it = 'y';
#endif
#if defined(CONFIG_TARGET_APALIS_IMX8) || \ #if defined(CONFIG_TARGET_APALIS_IMX8) || \
defined(CONFIG_TARGET_APALIS_IMX8X) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \
@@ -361,6 +373,12 @@ static int get_cfgblock_interactive(void)
tdx_hw_tag.prodid = COLIBRI_IMX7D; tdx_hw_tag.prodid = COLIBRI_IMX7D;
else if (!strcmp("imx7s", soc)) else if (!strcmp("imx7s", soc))
tdx_hw_tag.prodid = COLIBRI_IMX7S; tdx_hw_tag.prodid = COLIBRI_IMX7S;
else if (is_cpu_type(MXC_CPU_IMX8MM))
tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
else if (is_cpu_type(MXC_CPU_IMX8MMDL))
tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
else if (is_cpu_type(MXC_CPU_IMX8MN))
tdx_hw_tag.prodid = VERDIN_IMX8MNSL;
else if (is_cpu_type(MXC_CPU_IMX8QM)) { else if (is_cpu_type(MXC_CPU_IMX8QM)) {
if (it == 'y' || it == 'Y') { if (it == 'y' || it == 'Y') {
if (wb == 'y' || wb == 'Y') if (wb == 'y' || wb == 'Y')

3
board/toradex/common/tdx-cfg-block.h
View File

@@ -75,6 +75,9 @@ enum {
COLIBRI_IMX8DX, COLIBRI_IMX8DX,
APALIS_IMX8QXP, APALIS_IMX8QXP,
APALIS_IMX8DXP, APALIS_IMX8DXP,
VERDIN_IMX8MMQ_WIFI_BT_IT,
VERDIN_IMX8MNSL,
VERDIN_IMX8MMDL,
}; };
extern const char * const toradex_modules[]; extern const char * const toradex_modules[];