diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-30 17:16:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-30 17:16:35 -0400 |
| commit | 218e2c45af83f2cb7b1374b9023b4ced6eb0bb77 (patch) | |
| tree | e78dcbb902ebca32f6048b74e67414419dc4edab /lib/efi_loader/efi_gop.c | |
| parent | 6f02819cceb19c334f1dbd6eccefb4ccfae319f9 (diff) | |
| parent | b86986c7b314f1378ca5be8df49310a6ce7302f8 (diff) | |
Merge tag 'video-20221030' of https://source.denx.de/u-boot/custodians/u-boot-video
- fix [hv]sync active vs back porch in dw_mipi_dsi
- simplefb rotation support
- support splash as raw image from MMC
- enhancements to Truetype console (multiple fonts and sizes)
- drop old LCD support
Diffstat (limited to 'lib/efi_loader/efi_gop.c')
| -rw-r--r-- | lib/efi_loader/efi_gop.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 20bd7fff086..d1dc2f22d0f 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -252,21 +252,13 @@ static efi_uintn_t gop_get_bpp(struct efi_gop *this) efi_uintn_t vid_bpp = 0; switch (gopobj->bpix) { -#ifdef CONFIG_DM_VIDEO case VIDEO_BPP32: -#else - case LCD_COLOR32: -#endif if (gopobj->info.pixel_format == EFI_GOT_BGRA8) vid_bpp = 32; else vid_bpp = 30; break; -#ifdef CONFIG_DM_VIDEO case VIDEO_BPP16: -#else - case LCD_COLOR16: -#endif vid_bpp = 16; break; } @@ -476,8 +468,6 @@ efi_status_t efi_gop_register(void) u64 fb_base, fb_size; void *fb; efi_status_t ret; - -#ifdef CONFIG_DM_VIDEO struct udevice *vdev; struct video_priv *priv; @@ -495,26 +485,10 @@ efi_status_t efi_gop_register(void) fb_base = (uintptr_t)priv->fb; fb_size = priv->fb_size; fb = priv->fb; -#else - int line_len; - - bpix = panel_info.vl_bpix; - format = VIDEO_UNKNOWN; - col = panel_info.vl_col; - row = panel_info.vl_row; - fb_base = gd->fb_base; - fb_size = lcd_get_size(&line_len); - fb = (void*)gd->fb_base; -#endif switch (bpix) { -#ifdef CONFIG_DM_VIDEO case VIDEO_BPP16: case VIDEO_BPP32: -#else - case LCD_COLOR32: - case LCD_COLOR16: -#endif break; default: /* So far, we only work in 16 or 32 bit mode */ @@ -553,11 +527,7 @@ efi_status_t efi_gop_register(void) gopobj->info.version = 0; gopobj->info.width = col; gopobj->info.height = row; -#ifdef CONFIG_DM_VIDEO if (bpix == VIDEO_BPP32) -#else - if (bpix == LCD_COLOR32) -#endif { if (format == VIDEO_X2R10G10B10) { gopobj->info.pixel_format = EFI_GOT_BITMASK; |