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 a4c587a390834c8017197d8b2b9fa47e026cf535..dc9ffaabf205aacb7f41a0b9ba6a89a0899d850e 100644 (file)
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -4,15 +4,19 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <linux/libfdt.h>
-#include <environment.h>
-#include <fsl_esdhc.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>
 
@@ -40,21 +44,11 @@ static void setup_iomux_uart(void)
 
 int board_early_init_f(void)
 {
+       sc_pm_clock_rate_t rate = SC_80MHZ;
        int ret;
-       /* Set UART0 clock root to 80 MHz */
-       sc_pm_clock_rate_t rate = 80000000;
-
-       /* Power up UART0 */
-       ret = sc_pm_set_resource_power_mode(-1, SC_R_UART_0, SC_PM_PW_MODE_ON);
-       if (ret)
-               return ret;
-
-       ret = sc_pm_set_clock_rate(-1, SC_R_UART_0, 2, &rate);
-       if (ret)
-               return ret;
 
-       /* Enable UART0 clock root */
-       ret = sc_pm_clock_enable(-1, SC_R_UART_0, 2, true, false);
+       /* Set UART0 clock root to 80 MHz */
+       ret = sc_pm_setup_uart(SC_R_UART_0, rate);
        if (ret)
                return ret;
 
@@ -63,7 +57,7 @@ int board_early_init_f(void)
        return 0;
 }
 
-#if IS_ENABLED(CONFIG_DM_GPIO)
+#if CONFIG_IS_ENABLED(DM_GPIO)
 static void board_gpio_init(void)
 {
        struct gpio_desc desc;
@@ -104,19 +98,6 @@ int board_phy_config(struct phy_device *phydev)
 }
 #endif
 
-void build_info(void)
-{
-       u32 sc_build = 0, sc_commit = 0;
-
-       /* Get SCFW build and commit id */
-       sc_misc_build_info(-1, &sc_build, &sc_commit);
-       if (!sc_build) {
-               printf("SCFW does not support build info\n");
-               sc_commit = 0; /* Display 0 when the build info is not supported*/
-       }
-       printf("Build: SCFW %x\n", sc_commit);
-}
-
 int checkboard(void)
 {
        puts("Board: iMX8QXP MEK\n");
@@ -131,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;
 }
 
 /*
@@ -161,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;
 }