Merge branch 'master' of git://git.denx.de/u-boot-video

This commit is contained in:
Tom Rini 2017-02-09 14:54:09 -05:00
commit f1cc97764b

View file

@ -1968,7 +1968,7 @@ static void *video_logo(void)
static int cfb_fb_is_in_dram(void) static int cfb_fb_is_in_dram(void)
{ {
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
#if defined(CONFIG_ARM) || defined(CONFIG_AVR32) || defined(COFNIG_NDS32) || \ #if defined(CONFIG_ARM) || defined(CONFIG_AVR32) || defined(CONFIG_NDS32) || \
defined(CONFIG_SANDBOX) || defined(CONFIG_X86) defined(CONFIG_SANDBOX) || defined(CONFIG_X86)
ulong start, end; ulong start, end;
int i; int i;