]> git.baikalelectronics.ru Git - uboot.git/commitdiff
arm: mach-k3: do board config for PM only if supported
authorTero Kristo <t-kristo@ti.com>
Fri, 11 Jun 2021 08:45:20 +0000 (11:45 +0300)
committerLokesh Vutla <lokeshvutla@ti.com>
Fri, 11 Jun 2021 11:04:52 +0000 (16:34 +0530)
If the raw PM support is built in, we are operating in the split
firmware approach mode where PM support is not available. In this
case, skip the board config for this.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tero Kristo <kristo@kernel.org>
arch/arm/mach-k3/sysfw-loader.c

index 0bacfc4d0770bea0bd34aaa8d4c43dfc49c3bb48..41449db89d3608f6408c6afe2bc576cab43b8338 100644 (file)
@@ -159,11 +159,13 @@ static void k3_sysfw_configure_using_fit(void *fit,
                      ret);
 
        /* Apply power/clock (PM) specific configuration to SYSFW */
+#if !CONFIG_IS_ENABLED(K3_DM_FW)
        ret = board_ops->board_config_pm(ti_sci,
                                         (u64)(u32)cfg_fragment_addr,
                                         (u32)cfg_fragment_size);
        if (ret)
                panic("Failed to set board PM configuration (%d)\n", ret);
+#endif
 
        /* Extract resource management (RM) specific configuration from FIT */
        ret = fit_get_data_by_name(fit, images, SYSFW_CFG_RM,