From 245b1029e1af8b2e71c6d7aebc7d68bdebd644d3 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Thu, 13 Jun 2019 05:12:38 +0200 Subject: bmp_logo: support CONFIG_DM_VIDEO in case of bmp_logo, the video_bmp driver is used for drawing a bmp logo. This driver supports only "full" bmp data. Adding a logo with the bmp_logo tool to u-boot binary adds currently only real data and drops the bmp header. This patch adds now the full bmp data to the u-boot binary, so video_bmp driver works with the logo embedded into u-boot. Fixed also some checkpatch error poping up with this patch. Signed-off-by: Heiko Schocher --- tools/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index 87d81a3d41..c7afe8a4b3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -269,8 +269,14 @@ __build: $(LOGO-y) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ +ifeq ($(CONFIG_DM_VIDEO),y) +$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) + $(obj)/bmp_logo --gen-bmp $(LOGO_BMP) > $@ +else $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@ +#endif +endif # Let clean descend into subdirs subdir- += env -- cgit