tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

video/logo: add a type parameter to the logo makefile function

When translating a portable pixmap file into a .c file, the pnmtologo
tool expects to receive the image type (either mono, vga16 or clut224)
as an argument under the -t option.

Currently, this information is stored in the file name. Because we
will allow for custom logo in an upcoming change, it is preferable to
decouple the image name from its type.

Add a new $2 parameter to the Makefile logo function which contains
the image type.

Update all the individual targets to provide this new argument.

Signed-off-by: Vincent Mailhol <mailhol@kernel.org>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Vincent Mailhol and committed by
Helge Deller a7aa2b51 672b3521

+7 -4
+7 -4
drivers/video/logo/Makefile
··· 22 22 23 23 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." 24 24 quiet_cmd_logo = LOGO $@ 25 - cmd_logo = $(obj)/pnmtologo -t $(lastword $(subst _, ,$*)) -n $* -o $@ $< 25 + cmd_logo = $(obj)/pnmtologo -t $2 -n $* -o $@ $< 26 26 27 27 $(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE 28 - $(call if_changed,logo) 28 + $(call if_changed,logo,mono) 29 29 30 - $(obj)/%.c: $(src)/%.ppm $(obj)/pnmtologo FORCE 31 - $(call if_changed,logo) 30 + $(obj)/%_vga16.c: $(src)/%_vga16.ppm $(obj)/pnmtologo FORCE 31 + $(call if_changed,logo,vga16) 32 + 33 + $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(obj)/pnmtologo FORCE 34 + $(call if_changed,logo,clut224) 32 35 33 36 # generated C files 34 37 targets += *_mono.c *_vga16.c *_clut224.c