mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-27 16:43:32 +01:00 
			
		
		
		
	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>
This commit is contained in:
		| @@ -214,6 +214,7 @@ void board_init_f(ulong dummy) | |||||||
| 	if (ret) | 	if (ret) | ||||||
| 		panic("DRAM init failed: %d\n", ret); | 		panic("DRAM init failed: %d\n", ret); | ||||||
| #endif | #endif | ||||||
|  | 	spl_enable_dcache(); | ||||||
| } | } | ||||||
|  |  | ||||||
| u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) | u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) | ||||||
|   | |||||||
| @@ -60,42 +60,31 @@ int dram_init_banksize(void) | |||||||
| } | } | ||||||
|  |  | ||||||
| #if defined(CONFIG_SPL_BUILD) | #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) | static int video_setup(void) | ||||||
| { | { | ||||||
|  | 	if (CONFIG_IS_ENABLED(VIDEO)) { | ||||||
| 		ulong addr; | 		ulong addr; | ||||||
| 		int ret; | 		int ret; | ||||||
| 	addr = gd->relocaddr; |  | ||||||
|  |  | ||||||
|  | 		addr = gd->relocaddr; | ||||||
| 		ret = video_reserve(&addr); | 		ret = video_reserve(&addr); | ||||||
| 		if (ret) | 		if (ret) | ||||||
| 			return ret; | 			return ret; | ||||||
| 		debug("Reserving %luk for video at: %08lx\n", | 		debug("Reserving %luk for video at: %08lx\n", | ||||||
| 		      ((unsigned long)gd->relocaddr - addr) >> 10, addr); | 		      ((unsigned long)gd->relocaddr - addr) >> 10, addr); | ||||||
| 		gd->relocaddr = addr; | 		gd->relocaddr = addr; | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif |  | ||||||
| void spl_board_init(void) | void spl_board_init(void) | ||||||
| { | { | ||||||
| #if defined(CONFIG_SPL_VIDEO_TIDSS) |  | ||||||
| 	setup_dram(); |  | ||||||
| 	arch_reserve_mmu(); |  | ||||||
| 	video_setup(); | 	video_setup(); | ||||||
| 	enable_caches(); | 	enable_caches(); | ||||||
|  | 	if (IS_ENABLED(CONFIG_SPL_SPLASH_SCREEN) && IS_ENABLED(CONFIG_SPL_BMP)) | ||||||
| 		splash_display(); | 		splash_display(); | ||||||
| #endif |  | ||||||
| } | } | ||||||
|  |  | ||||||
| #if defined(CONFIG_K3_AM64_DDRSS) | #if defined(CONFIG_K3_AM64_DDRSS) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user