From a487ce391920b74df0c5c500101b371eea0f1640 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 31 Jul 2015 19:55:10 -0400 Subject: [PATCH] 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 Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/lowlevel_init.S | 2 +- arch/arm/lib/spl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S index 1db673754d..6083880ec8 100644 --- a/arch/arm/cpu/armv7/lowlevel_init.S +++ b/arch/arm/cpu/armv7/lowlevel_init.S @@ -25,7 +25,7 @@ ENTRY(lowlevel_init) ldr sp, =CONFIG_SPL_STACK #endif bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ -#ifdef CONFIG_DM +#ifdef CONFIG_SPL_DM mov r9, #0 #else /* diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index bd8c7d2ede..d737a5cce8 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -13,7 +13,7 @@ #include #include -#ifndef CONFIG_DM +#ifndef CONFIG_SPL_DM /* Pointer to as well as the global data structure for SPL */ DECLARE_GLOBAL_DATA_PTR; @@ -35,7 +35,7 @@ void __weak board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); -#ifndef CONFIG_DM +#ifndef CONFIG_SPL_DM /* TODO: Remove settings of the global data pointer here */ gd = &gdata; #endif -- 2.39.5