X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fspl.c;h=d737a5cce83dcc867a30a6487206e8ed7402e858;hb=8d8e13e129f20ef82a271094eb713d513e83adf4;hp=bd8c7d2ede0c589aaf7526252dc92e95d2f8dc98;hpb=9b5b60a05cb8bba2d135439419b2030764e359bd;p=u-boot 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