imx: imx8qxp: update fdt_file according to m4 state

[oweals/u-boot.git] / board / freescale / imx8qxp_mek / imx8qxp_mek.c

diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 194eb60cd37ecb46484c25e59cbc2a3fce269786..dc9ffaabf205aacb7f41a0b9ba6a89a0899d850e 100644 (file)
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -4,16 +4,19 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
 #include <init.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
+#include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
+#include <asm/arch/snvs_security_sc.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
 
@@ -109,12 +112,16 @@ int board_init(void)
 {
        board_gpio_init();
 
-       return 0;
-}
+#ifdef CONFIG_IMX_SNVS_SEC_SC_AUTO
+       {
+               int ret = snvs_security_sc_init();
 
-void detail_board_ddr_info(void)
-{
-       puts("\nDDR    ");
+               if (ret)
+                       return ret;
+       }
+#endif
+
+       return 0;
 }
 
 /*
@@ -139,10 +146,23 @@ int board_mmc_get_env_dev(int devno)
 
 int board_late_init(void)
 {
+       char *fdt_file;
+       bool m4_booted;
+
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
        env_set("board_name", "MEK");
        env_set("board_rev", "iMX8QXP");
 #endif
 
+       fdt_file = env_get("fdt_file");
+       m4_booted = m4_parts_booted();
+
+       if (fdt_file && !strcmp(fdt_file, "undefined")) {
+               if (m4_booted)
+                       env_set("fdt_file", "imx8qxp-mek-rpmsg.dtb");
+               else
+                       env_set("fdt_file", "imx8qxp-mek.dtb");
+       }
+
        return 0;
 }