mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
- fix Coverity CID 280902 issue in vid_console_color()
- fix vid_console_color() build warning - fix for mxsfb to ensure correct Linux logo position -----BEGIN PGP SIGNATURE----- iGwEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCXkGKMg4cYWd1c3RAZGVu eC5kZQAKCRBM6ATMmsalXCY3AJ9zzSWCPRa6M6YbYiHyfasyP1uf+gCdG2bMDRaC vNpAeNnM9aWgJMkje6k= =al8x -----END PGP SIGNATURE----- Merge tag 'fixes-for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-video - fix Coverity CID 280902 issue in vid_console_color() - fix vid_console_color() build warning - fix for mxsfb to ensure correct Linux logo position
This commit is contained in:
commit
5f2fe7d461
2 changed files with 13 additions and 9 deletions
|
@ -429,6 +429,6 @@ U_BOOT_DRIVER(mxs_video) = {
|
|||
.bind = mxs_video_bind,
|
||||
.probe = mxs_video_probe,
|
||||
.remove = mxs_video_remove,
|
||||
.flags = DM_FLAG_PRE_RELOC,
|
||||
.flags = DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE,
|
||||
};
|
||||
#endif /* ifndef CONFIG_DM_VIDEO */
|
||||
|
|
|
@ -144,22 +144,26 @@ u32 vid_console_color(struct video_priv *priv, unsigned int idx)
|
|||
((colors[idx].g >> 2) << 5) |
|
||||
((colors[idx].b >> 3) << 0);
|
||||
}
|
||||
break;
|
||||
case VIDEO_BPP32:
|
||||
if (CONFIG_IS_ENABLED(VIDEO_BPP32)) {
|
||||
return (colors[idx].r << 16) |
|
||||
(colors[idx].g << 8) |
|
||||
(colors[idx].b << 0);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
/*
|
||||
* For unknown bit arrangements just support
|
||||
* black and white.
|
||||
*/
|
||||
if (idx)
|
||||
return 0xffffff; /* white */
|
||||
else
|
||||
return 0x000000; /* black */
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* For unknown bit arrangements just support
|
||||
* black and white.
|
||||
*/
|
||||
if (idx)
|
||||
return 0xffffff; /* white */
|
||||
|
||||
return 0x000000; /* black */
|
||||
}
|
||||
|
||||
static char *parsenum(char *s, int *num)
|
||||
|
|
Loading…
Reference in a new issue