Merge tag 'u-boot-stm32-20250310' of https://source.denx.de/u-boot/custodians/u-boot-stm

trini · trini · commit 444cc6f08038 · 2025-03-10T07:48:25.000-06:00
ARM: stm32mp: Fix boot hang on STM32MP15xx with 1 GiB of DRAM.
diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c
@@ -82,7 +82,7 @@ void dram_bank_mmu_setup(int bank)
 		option = DCACHE_DEFAULT_OPTION;
 		if (use_lmb &&
 		    (lmb_is_reserved_flags(i << MMU_SECTION_SHIFT, LMB_NOMAP) ||
-		    addr >= gd->ram_top)
+		     (gd->ram_top && addr >= gd->ram_top))
 		   )
 			option = 0; /* INVALID ENTRY in TLB */
 		set_section_dcache(i, option);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void dram_bank_mmu_setup(int bank)`
`82`	`82`	`option = DCACHE_DEFAULT_OPTION;`
`83`	`83`	`if (use_lmb &&`
`84`	`84`	`(lmb_is_reserved_flags(i << MMU_SECTION_SHIFT, LMB_NOMAP) \|\|`
`85`		`- addr >= gd->ram_top)`
	`85`	`+ (gd->ram_top && addr >= gd->ram_top))`
`86`	`86`	`)`
`87`	`87`	`option = 0; /* INVALID ENTRY in TLB */`
`88`	`88`	`set_section_dcache(i, option);`