dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-27 21:41:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'fixes-for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-video

Browse Source 
- 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:
Tom Rini
2020-02-10 12:08:51 -05:00
parent c998cbea87 8382b10192
commit 5f2fe7d461
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/mxsfb.c
View File

@@ -429,6 +429,6 @@ U_BOOT_DRIVER(mxs_video) = {
.bind = mxs_video_bind, .bind = mxs_video_bind,
.probe = mxs_video_probe, .probe = mxs_video_probe,
.remove = mxs_video_remove, .remove = mxs_video_remove,
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE,
}; };
#endif /* ifndef CONFIG_DM_VIDEO */ #endif /* ifndef CONFIG_DM_VIDEO */

8
drivers/video/vidconsole-uclass.c
View File

@@ -144,23 +144,27 @@ u32 vid_console_color(struct video_priv *priv, unsigned int idx)
((colors[idx].g >> 2) << 5) | ((colors[idx].g >> 2) << 5) |
((colors[idx].b >> 3) << 0); ((colors[idx].b >> 3) << 0);
} }
break;
case VIDEO_BPP32: case VIDEO_BPP32:
if (CONFIG_IS_ENABLED(VIDEO_BPP32)) { if (CONFIG_IS_ENABLED(VIDEO_BPP32)) {
return (colors[idx].r << 16) | return (colors[idx].r << 16) |
(colors[idx].g << 8) | (colors[idx].g << 8) |
(colors[idx].b << 0); (colors[idx].b << 0);
} }
break;
default: default:
break;
}
/* /*
* For unknown bit arrangements just support * For unknown bit arrangements just support
* black and white. * black and white.
*/ */
if (idx) if (idx)
return 0xffffff; /* white */ return 0xffffff; /* white */
else
return 0x000000; /* black */ return 0x000000; /* black */
} }
}
static char *parsenum(char *s, int *num) static char *parsenum(char *s, int *num)
{ {