LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tom Rini 2015-07-31 19:55:10 -04:00
parent 0a9e34056f
commit b5d92ba1ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/lowlevel_init.S
View File

@ -21,7 +21,7 @@ ENTRY(lowlevel_init)
*/ */
ldr sp, =CONFIG_SYS_INIT_SP_ADDR ldr sp, =CONFIG_SYS_INIT_SP_ADDR
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
#ifdef CONFIG_DM #ifdef CONFIG_SPL_DM
mov r9, #0 mov r9, #0
#else #else
/* /*

4
arch/arm/lib/spl.c
View File

@ -13,7 +13,7 @@
#include <image.h> #include <image.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#ifndef CONFIG_DM #ifndef CONFIG_SPL_DM
/* Pointer to as well as the global data structure for SPL */ /* Pointer to as well as the global data structure for SPL */
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -35,7 +35,7 @@ void __weak board_init_f(ulong dummy)
/* Clear the BSS. */ /* Clear the BSS. */
memset(__bss_start, 0, __bss_end - __bss_start); memset(__bss_start, 0, __bss_end - __bss_start);
#ifndef CONFIG_DM #ifndef CONFIG_SPL_DM
/* TODO: Remove settings of the global data pointer here */ /* TODO: Remove settings of the global data pointer here */
gd = &gdata; gd = &gdata;
#endif #endif