Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / board / toradex / common / tdx-cfg-block.h

diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index 961bb43..9debd5f 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (c) 2016 Toradex, Inc.
+ * Copyright (c) 2016-2020 Toradex
  */
 
 #ifndef _TDX_CFG_BLOCK_H
@@ -25,53 +25,87 @@ enum {
        COLIBRI_PXA270_V1_520MHZ,
        COLIBRI_PXA320,
        COLIBRI_PXA300,
-       COLIBRI_PXA310,
+       COLIBRI_PXA310, /* 5 */
        COLIBRI_PXA320_IT,
        COLIBRI_PXA300_XT,
        COLIBRI_PXA270_312MHZ,
        COLIBRI_PXA270_520MHZ,
-       COLIBRI_VF50, /* not currently on sale */
-       COLIBRI_VF61,
+       COLIBRI_VF50, /* 10 */
+       COLIBRI_VF61, /* not currently on sale */
        COLIBRI_VF61_IT,
        COLIBRI_VF50_IT,
        COLIBRI_IMX6S,
-       COLIBRI_IMX6DL,
+       COLIBRI_IMX6DL, /* 15 */
        COLIBRI_IMX6S_IT,
        COLIBRI_IMX6DL_IT,
+       /* 18 */
+       /* 19 */
        COLIBRI_T20_256MB = 20,
        COLIBRI_T20_512MB,
        COLIBRI_T20_512MB_IT,
        COLIBRI_T30,
        COLIBRI_T20_256MB_IT,
-       APALIS_T30_2GB,
+       APALIS_T30_2GB, /* 25 */
        APALIS_T30_1GB,
        APALIS_IMX6Q,
        APALIS_IMX6Q_IT,
        APALIS_IMX6D,
-       COLIBRI_T30_IT,
+       COLIBRI_T30_IT, /* 30 */
        APALIS_T30_IT,
        COLIBRI_IMX7S,
        COLIBRI_IMX7D,
        APALIS_TK1_2GB,
-       APALIS_IMX6D_IT,
+       APALIS_IMX6D_IT, /* 35 */
        COLIBRI_IMX6ULL,
-       APALIS_IMX8QM, /* 37 */
-       COLIBRI_IMX8X,
+       APALIS_IMX8QM_WIFI_BT_IT,
+       COLIBRI_IMX8QXP_WIFI_BT_IT,
        COLIBRI_IMX7D_EMMC,
        COLIBRI_IMX6ULL_WIFI_BT_IT, /* 40 */
        COLIBRI_IMX7D_EPDC,
-       APALIS_TK1_4GB,
+       APALIS_TK1_4GB, /* not currently on sale */
        COLIBRI_T20_512MB_IT_SETEK,
        COLIBRI_IMX6ULL_IT,
        COLIBRI_IMX6ULL_WIFI_BT, /* 45 */
+       APALIS_IMX8QXP_WIFI_BT_IT,
+       APALIS_IMX8QM_IT,
+       APALIS_IMX8QP_WIFI_BT,
+       APALIS_IMX8QP,
+       COLIBRI_IMX8QXP_IT, /* 50 */
+       COLIBRI_IMX8DX_WIFI_BT,
+       COLIBRI_IMX8DX,
+       APALIS_IMX8QXP,
+       APALIS_IMX8DXP,
+       VERDIN_IMX8MMQ_WIFI_BT_IT, /* 55 */
+       VERDIN_IMX8MNQ_WIFI_BT,
+       VERDIN_IMX8MMDL,
+       VERDIN_IMX8MPQ_WIFI_BT_IT,
+       VERDIN_IMX8MMQ_IT,
+       VERDIN_IMX8MMDL_WIFI_BT_IT, /* 60 */
+       VERDIN_IMX8MPQ,
+};
+
+enum {
+       DAHLIA = 155,
+       VERDIN_DEVELOPMENT_BOARD = 156,
+};
+
+enum {
+       VERDIN_DSI_TO_HDMI_ADAPTER = 157,
+       VERDIN_DSI_TO_LVDS_ADAPTER = 159,
 };
 
 extern const char * const toradex_modules[];
+extern const char * const toradex_carrier_boards[];
 extern bool valid_cfgblock;
 extern struct toradex_hw tdx_hw_tag;
+extern struct toradex_hw tdx_car_hw_tag;
 extern struct toradex_eth_addr tdx_eth_addr;
 extern u32 tdx_serial;
+extern u32 tdx_car_serial;
 
 int read_tdx_cfg_block(void);
+int read_tdx_cfg_block_carrier(void);
+
+int try_migrate_tdx_cfg_block_carrier(void);
 
 #endif /* _TDX_CFG_BLOCK_H */