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 /common/board_f.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 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/common/board_f.c b/common/board_f.c index 4355d1c82d4..51ba5931899 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -28,7 +28,6 @@ #include <i2c.h> #include <init.h> #include <initcall.h> -#include <lcd.h> #include <log.h> #include <malloc.h> #include <mapmem.h> @@ -409,22 +408,18 @@ __weak int arch_reserve_mmu(void) static int reserve_video(void) { -#ifdef CONFIG_DM_VIDEO - ulong addr; - int ret; + if (IS_ENABLED(CONFIG_VIDEO)) { + ulong addr; + int ret; - addr = gd->relocaddr; - ret = video_reserve(&addr); - if (ret) - return ret; - debug("Reserving %luk for video at: %08lx\n", - ((unsigned long)gd->relocaddr - addr) >> 10, addr); - gd->relocaddr = addr; -#elif defined(CONFIG_LCD) - /* reserve memory for LCD display (always full pages) */ - gd->relocaddr = lcd_setmem(gd->relocaddr); - gd->fb_base = gd->relocaddr; -#endif + addr = gd->relocaddr; + ret = video_reserve(&addr); + if (ret) + return ret; + debug("Reserving %luk for video at: %08lx\n", + ((unsigned long)gd->relocaddr - addr) >> 10, addr); + gd->relocaddr = addr; + } return 0; } |