- fix splash build breakage with newer llvm-7
-----BEGIN PGP SIGNATURE----- iGsEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCXbrgbA4cYWd1c3RAZGVu eC5kZQAKCRBM6ATMmsalXJOPAJwKJBfhxSmDy+KqxTVIgheBHG5SVwCWIhsdRPAL Pru2lp1u3cWByYt9Qw== =2Vp3 -----END PGP SIGNATURE----- Merge tag 'video-for-2020.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video - fix splash build breakage with newer llvm-7
This commit is contained in:
commit
bafed10542
@ -144,8 +144,6 @@ void splash_display_banner(void)
|
||||
vidconsole_put_string(dev, buf);
|
||||
vidconsole_position_cursor(dev, 0, row);
|
||||
}
|
||||
#else
|
||||
static inline void splash_display_banner(void) { }
|
||||
#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
|
||||
|
||||
/*
|
||||
@ -177,7 +175,9 @@ int splash_display(void)
|
||||
if (x || y)
|
||||
goto end;
|
||||
|
||||
#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
|
||||
splash_display_banner();
|
||||
#endif
|
||||
end:
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user