projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: evb-rk3288: add -u-boot.dtsi
[oweals/u-boot.git]
/
arch
/
arm
/
mach-mvebu
/
cpu.c
diff --git
a/arch/arm/mach-mvebu/cpu.c
b/arch/arm/mach-mvebu/cpu.c
index c5b3df46aab765076a19fa6b43e67366f7e92156..f4b7a4fa80108176784794cfab8d577c784a1f3c 100644
(file)
--- a/
arch/arm/mach-mvebu/cpu.c
+++ b/
arch/arm/mach-mvebu/cpu.c
@@
-520,7
+520,7
@@
int arch_misc_init(void)
}
#endif /* CONFIG_ARCH_MISC_INIT */
}
#endif /* CONFIG_ARCH_MISC_INIT */
-#if
def CONFIG_MMC_SDHCI_MV
+#if
defined(CONFIG_MMC_SDHCI_MV) && !defined(CONFIG_DM_MMC)
int board_mmc_init(bd_t *bis)
{
mv_sdh_init(MVEBU_SDIO_BASE, 0, 0,
int board_mmc_init(bd_t *bis)
{
mv_sdh_init(MVEBU_SDIO_BASE, 0, 0,
@@
-542,6
+542,10
@@
static void ahci_mvebu_mbus_config(void __iomem *base)
const struct mbus_dram_target_info *dram;
int i;
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++) {
dram = mvebu_mbus_dram_info();
for (i = 0; i < 4; i++) {