arm: Disable ATAGs support

[platform/kernel/u-boot.git] / board / toradex / common / tdx-common.c

diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index f1ab794..9db4553 100644 (file)
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -1,22 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Toradex, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <env.h>
 #include <g_dnl.h>
-#include <libfdt.h>
+#include <init.h>
+#include <linux/libfdt.h>
+
+#ifdef CONFIG_DM_VIDEO
+#include <bmp_logo.h>
+#include <dm.h>
+#include <splash.h>
+#include <video.h>
+#endif
 
 #include "tdx-cfg-block.h"
+#include <asm/setup.h>
 #include "tdx-common.h"
 
+#define TORADEX_OUI 0x00142dUL
+
 #ifdef CONFIG_TDX_CFG_BLOCK
 static char tdx_serial_str[9];
 static char tdx_board_rev_str[6];
 
-#ifdef CONFIG_REVISION_TAG
-u32 get_board_rev(void)
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+static char tdx_car_serial_str[9];
+static char tdx_car_rev_str[6];
+static char *tdx_carrier_board_name;
+#endif
+
+#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)
+u32 get_board_revision(void)
 {
        /* Check validity */
        if (!tdx_hw_tag.ver_major)
@@ -67,48 +84,70 @@ int show_board_info(void)
        unsigned char ethaddr[6];
 
        if (read_tdx_cfg_block()) {
-               printf("Missing Toradex config block\n");
+               printf("MISSING TORADEX CONFIG BLOCK\n");
+               tdx_eth_addr.oui = htonl(TORADEX_OUI << 8);
+               tdx_eth_addr.nic = htonl(tdx_serial << 8);
                checkboard();
-               return 0;
+       } else {
+               sprintf(tdx_serial_str, "%08u", tdx_serial);
+               sprintf(tdx_board_rev_str, "V%1d.%1d%c",
+                       tdx_hw_tag.ver_major,
+                       tdx_hw_tag.ver_minor,
+                       (char)tdx_hw_tag.ver_assembly + 'A');
+
+               env_set("serial#", tdx_serial_str);
+
+               printf("Model: Toradex %s %s, Serial# %s\n",
+                      toradex_modules[tdx_hw_tag.prodid],
+                      tdx_board_rev_str,
+                      tdx_serial_str);
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+               if (read_tdx_cfg_block_carrier()) {
+                       printf("MISSING TORADEX CARRIER CONFIG BLOCKS\n");
+                       try_migrate_tdx_cfg_block_carrier();
+               } else {
+                       tdx_carrier_board_name = (char *)
+                               toradex_carrier_boards[tdx_car_hw_tag.prodid];
+
+                       sprintf(tdx_car_serial_str, "%08u", tdx_car_serial);
+                       sprintf(tdx_car_rev_str, "V%1d.%1d%c",
+                               tdx_car_hw_tag.ver_major,
+                               tdx_car_hw_tag.ver_minor,
+                               (char)tdx_car_hw_tag.ver_assembly +
+                               'A');
+
+                       env_set("carrier_serial#", tdx_car_serial_str);
+                       printf("Carrier: Toradex %s %s, Serial# %s\n",
+                              tdx_carrier_board_name,
+                              tdx_car_rev_str,
+                              tdx_car_serial_str);
+               }
+#endif
        }
 
-       /* board serial-number */
-       sprintf(tdx_serial_str, "%08u", tdx_serial);
-       sprintf(tdx_board_rev_str, "V%1d.%1d%c",
-               tdx_hw_tag.ver_major,
-               tdx_hw_tag.ver_minor,
-               (char)tdx_hw_tag.ver_assembly + 'A');
-
-       setenv("serial#", tdx_serial_str);
-
        /*
         * Check if environment contains a valid MAC address,
         * set the one from config block if not
         */
-       if (!eth_getenv_enetaddr("ethaddr", ethaddr))
-               eth_setenv_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
+       if (!eth_env_get_enetaddr("ethaddr", ethaddr))
+               eth_env_set_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
 
 #ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR
-       if (!eth_getenv_enetaddr("eth1addr", ethaddr)) {
+       if (!eth_env_get_enetaddr("eth1addr", ethaddr)) {
                /*
                 * Secondary MAC address is allocated from block
                 * 0x100000 higher then the first MAC address
                 */
                memcpy(ethaddr, &tdx_eth_addr, 6);
                ethaddr[3] += 0x10;
-               eth_setenv_enetaddr("eth1addr", ethaddr);
+               eth_env_set_enetaddr("eth1addr", ethaddr);
        }
 #endif
 
-       printf("Model: Toradex %s %s, Serial# %s\n",
-              toradex_modules[tdx_hw_tag.prodid],
-              tdx_board_rev_str,
-              tdx_serial_str);
-
        return 0;
 }
 
-#ifdef CONFIG_USBDOWNLOAD_GADGET
+#ifdef CONFIG_TDX_CFG_BLOCK_USB_GADGET_PID
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
        unsigned short usb_pid;
@@ -118,10 +157,10 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 
        return 0;
 }
-#endif /* CONFIG_USBDOWNLOAD_GADGET */
+#endif
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, bd_t *bd)
+#if defined(CONFIG_OF_LIBFDT)
+int ft_common_board_setup(void *blob, struct bd_info *bd)
 {
        if (tdx_serial) {
                fdt_setprop(blob, 0, "serial-number", tdx_serial_str,
@@ -144,8 +183,8 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 #else /* CONFIG_TDX_CFG_BLOCK */
 
-#ifdef CONFIG_REVISION_TAG
-u32 get_board_rev(void)
+#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)
+u32 get_board_revision(void)
 {
        return 0;
 }
@@ -158,11 +197,9 @@ u32 get_board_serial(void)
 }
 #endif /* CONFIG_SERIAL_TAG */
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_common_board_setup(void *blob, struct bd_info *bd)
 {
        return 0;
 }
-#endif
 
 #endif /* CONFIG_TDX_CFG_BLOCK */