board: ti: am62x: evm: Update function calls for splash screen

Use spl_dcache_enable, in place of setup_dram, arch_reserve_mmu to set
up pagetable, initialise DRAM and enable Dcache to avoid multiple
function calls.

Check for CONFIG_SPL_VIDEO in place of CONFIG_SPL_VIDEO_TIDSS to prevent
any build failure in case video config is not defined and video related
functions are called.

Check for CONFIG_SPL_SPLASH_SCREEN and CONFIG_SPL_BMP before calling
splash_display to avoid compilation failure.

Signed-off-by: Nikhil M Jain <n-jain1@ti.com>

diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c
index 787fe9229552f4e9fd32c29ac58da091fbcd3ac1..0e5d44269ebfb69736bae24bcff04bb771262621 100644 (file)
--- a/arch/arm/mach-k3/am625_init.c
+++ b/arch/arm/mach-k3/am625_init.c
@@ -214,6 +214,7 @@ void board_init_f(ulong dummy)
        if (ret)
                panic("DRAM init failed: %d\n", ret);
 #endif
+       spl_enable_dcache();
 }
 
 u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)

diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c
index f7afd4f3785a87169f29f483756055f3774b6478..ad939088402e489502e6fc27a49c21715a2f2c7e 100644 (file)
--- a/board/ti/am62x/evm.c
+++ b/board/ti/am62x/evm.c
@@ -60,42 +60,31 @@ int dram_init_banksize(void)
 }
 
 #if defined(CONFIG_SPL_BUILD)
-#ifdef CONFIG_SPL_VIDEO_TIDSS
-static int setup_dram(void)
-{
-       dram_init();
-       dram_init_banksize();
-       gd->ram_base = CFG_SYS_SDRAM_BASE;
-       gd->ram_top = gd->ram_base + gd->ram_size;
-       gd->relocaddr = gd->ram_top;
-       return 0;
-}
-
 static int video_setup(void)
 {
-       ulong addr;
-       int ret;
-       addr = gd->relocaddr;
+       if (CONFIG_IS_ENABLED(VIDEO)) {
+               ulong addr;
+               int ret;
+
+               addr = gd->relocaddr;
+               ret = video_reserve(&addr);
+               if (ret)
+                       return ret;
+               debug("Reserving %luk for video at: %08lx\n",
+                     ((unsigned long)gd->relocaddr - addr) >> 10, addr);
+               gd->relocaddr = addr;
+       }
 
-       ret = video_reserve(&addr);
-       if (ret)
-               return ret;
-       debug("Reserving %luk for video at: %08lx\n",
-             ((unsigned long)gd->relocaddr - addr) >> 10, addr);
-       gd->relocaddr = addr;
        return 0;
 }
 
-#endif
 void spl_board_init(void)
 {
-#if defined(CONFIG_SPL_VIDEO_TIDSS)
-       setup_dram();
-       arch_reserve_mmu();
        video_setup();
        enable_caches();
-       splash_display();
-#endif
+       if (IS_ENABLED(CONFIG_SPL_SPLASH_SCREEN) && IS_ENABLED(CONFIG_SPL_BMP))
+               splash_display();
+
 }
 
 #if defined(CONFIG_K3_AM64_DDRSS)