diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-10 15:41:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-10 15:41:15 -0500 |
| commit | fd4b8f813f11879bb38a0d3a5839279e85325476 (patch) | |
| tree | 1710610287d3903ac05922c05e59c7e9abd885c9 /drivers/video/video-uclass.c | |
| parent | 520f9559020894950d4e962aba52220c8a1d6bfe (diff) | |
| parent | 2cc393f32fd9ffcf47f4877e8d1345a7981a0d02 (diff) | |
| download | u-boot-fd4b8f813f11879bb38a0d3a5839279e85325476.tar.gz u-boot-fd4b8f813f11879bb38a0d3a5839279e85325476.tar.xz u-boot-fd4b8f813f11879bb38a0d3a5839279e85325476.zip | |
Merge tag 'fixes-for-2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- fix crash and board reset when drawing RLE8 bitmaps
bigger than the framebuffer resolution
- reduce dead code in video and console uclass routines
(tested on mx53cx9020, sama5d2_xplained, stm32mp157c-ev1,
stm32f746-disco, stm32f769-disco and wandboard)
Diffstat (limited to 'drivers/video/video-uclass.c')
| -rw-r--r-- | drivers/video/video-uclass.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f660c5205e..5ea7568fa4 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -92,6 +92,7 @@ int video_clear(struct udevice *dev) struct video_priv *priv = dev_get_uclass_priv(dev); switch (priv->bpix) { +#ifdef CONFIG_VIDEO_BPP16 case VIDEO_BPP16: { u16 *ppix = priv->fb; u16 *end = priv->fb + priv->fb_size; @@ -100,6 +101,8 @@ int video_clear(struct udevice *dev) *ppix++ = priv->colour_bg; break; } +#endif +#ifdef CONFIG_VIDEO_BPP32 case VIDEO_BPP32: { u32 *ppix = priv->fb; u32 *end = priv->fb + priv->fb_size; @@ -108,6 +111,7 @@ int video_clear(struct udevice *dev) *ppix++ = priv->colour_bg; break; } +#endif default: memset(priv->fb, priv->colour_bg, priv->fb_size); break; |