| Message ID | 1438386912-14711-3-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Jul 31, 2015 at 07:55:10PM -0400, Tom Rini wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S index 427b0b1..1872c57 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 /* diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index bd8c7d2..d737a5c 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -13,7 +13,7 @@ #include <image.h> #include <linux/compiler.h> -#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
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> --- arch/arm/cpu/armv7/lowlevel_init.S | 2 +- arch/arm/lib/spl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)