Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Nikhil M Jain 2023-07-18 14:27:29 +05:30 committed by Tom Rini
parent dd5d1c5dcc
commit 12fdacea5a
2 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-k3/am625_init.c
View file

@ -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)

41
board/ti/am62x/evm.c
View file

@ -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)