summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-06-28 13:55:10 -0600
committerTom Rini <[email protected]>2024-06-28 13:55:10 -0600
commit8937bb265a7f2251c1bd999784a4ef10e9c6080d (patch)
tree861f7c1fa3ac8f1da27b840aeb7407fbc01ba411 /common
parentefee71ab4d51e4ee68960a93b0c23682be040bd9 (diff)
parentd780965927d4b176857895b5d64fae85ccd04eb8 (diff)
Merge patch series "Bug-fixes for a few boards (reduced series)"
Simon Glass <[email protected]> says: This series includes fixes to get some rockchip and nvidia boards working again. It also drops the broken Beaglebone Black config and provides a devicetree fix for coral (x86).
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_atf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 3bdd013a35f..9afe6456bc4 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -204,7 +204,8 @@ static void __noreturn bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry,
fdt_addr);
raw_write_daif(SPSR_EXCEPTION_MASK);
- dcache_disable();
+ if (!CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
+ dcache_disable();
atf_entry(bl31_params, (void *)fdt_addr);
}