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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile index 34a1aa7a8b7..af6a710c2dd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,6 @@ # Enable all the config-independent tools ifneq ($(HOST_TOOLS_ALL),) CONFIG_ARCH_KIRKWOOD = y -CONFIG_LCD_LOGO = y CONFIG_CMD_LOADS = y CONFIG_CMD_NET = y CONFIG_XWAY_SWAP_BYTES = y @@ -48,7 +47,6 @@ CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y) hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params -hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo HOSTCFLAGS_bmp_logo.o := -pedantic @@ -278,8 +276,6 @@ always := $(hostprogs-y) # Generated LCD/video logo LOGO_H = $(objtree)/include/bmp_logo.h LOGO_DATA_H = $(objtree)/include/bmp_logo_data.h -LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_H) -LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_DATA_H) LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H) LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H) @@ -316,7 +312,7 @@ __build: $(LOGO-y) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ -ifeq ($(CONFIG_DM_VIDEO),y) +ifeq ($(CONFIG_VIDEO),y) $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-bmp $(LOGO_BMP) > $@ else |