summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-31 19:55:10 -0400
committerTom Rini <trini@konsulko.com>2015-08-12 20:48:07 -0400
commitb5d92ba1ad97c06985ebc689e1ac1462a146832d (patch)
treeef811c229228b414d8d76fba22da3d58ed70ffce /arch/arm/cpu
parent0a9e34056fcf86fb64e70bd281875eb7bbdbabde (diff)
downloadblackbird-obmc-uboot-b5d92ba1ad97c06985ebc689e1ac1462a146832d.tar.gz
blackbird-obmc-uboot-b5d92ba1ad97c06985ebc689e1ac1462a146832d.zip
ARM: SPL: Use CONFIG_SPL_DM not CONFIG_DM
We now have the CONFIG_SPL_DM for code within SPL to toggle caring about DM or not. Without this change platforms that do enable CONFIG_DM but not CONFIG_SPL_DM may be broken (such as OMAP5). Cc: Albert Aribaud <albert.u.boot@aribaud.net> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/lowlevel_init.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S
index 427b0b1321..1872c57699 100644
--- a/arch/arm/cpu/armv7/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/lowlevel_init.S
@@ -21,7 +21,7 @@ ENTRY(lowlevel_init)
*/
ldr sp, =CONFIG_SYS_INIT_SP_ADDR
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
-#ifdef CONFIG_DM
+#ifdef CONFIG_SPL_DM
mov r9, #0
#else
/*
OpenPOWER on IntegriCloud