summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2019-05-16 13:03:57 +0300
committerStefan Roese <sr@denx.de>2019-07-11 10:58:02 +0200
commitf0aa1254776cbc0406d9b0b794479490799c3c47 (patch)
tree5722f292e8d87e6472f087baf7e65a5f3502bbc3 /arch/arm
parent760ef309cb63a3e22ebeecb9080f1034be1560f5 (diff)
arm: mvebu: fix ahci mbus config in SPL
SPL does not initialize mbus_dram_info. Don't change the ahci mbus settings of the ROM. This allows the ahci to work in SPL. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/cpu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index f09e7b10e9..f4b7a4fa80 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -542,6 +542,10 @@ static void ahci_mvebu_mbus_config(void __iomem *base)
const struct mbus_dram_target_info *dram;
int i;
+ /* mbus is not initialized in SPL; keep the ROM settings */
+ if (IS_ENABLED(CONFIG_SPL_BUILD))
+ return;
+
dram = mvebu_mbus_dram_info();
for (i = 0; i < 4; i++) {