Re: [PATCH] fbdev: move logo externs to header file

From: Geert Uytterhoeven
Date: Fri Apr 03 2009 - 09:38:50 EST


On Fri, 3 Apr 2009, Sam Ravnborg wrote:
> On Fri, Apr 03, 2009 at 01:45:40PM +0200, Geert Uytterhoeven wrote:
> > Now we have __initconst, we can finally move the external declarations for the
> > various Linux logo structures to <linux/linux_logo.h>.
> >
> > Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
> > Acked-By: James Simmons <jsimmons@xxxxxxxxxxxxx>
> > ---
> > James' ack dates back to the previous submission (way to long ago), when the
> > logos were still __initdata, which caused failures on some platforms with some
> > toolchain versions.
> >
> > Note: you have to remove the generated logos, as they're not automatically
> > regenerated if scripts/pnmtologo.c changes.
>
> Something like this to fix that bug?

Yep, after s/pnmtlogo/pnmtologo/g
(it cannot work as-is, as there's one place where you did spell `pnmtologo'
correctly ;-)

Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>

> Untested as I'm busy atm.
>
> Sam
>
> diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
> index b91251d..6a26982 100644
> --- a/drivers/video/logo/Makefile
> +++ b/drivers/video/logo/Makefile
> @@ -37,22 +37,24 @@ extra-y += $(call logo-cfiles,_clut224,ppm)
> # Gray 256
> extra-y += $(call logo-cfiles,_gray256,pgm)
>
> +pnmtlogo := scripts/pnmtologo
> +
> # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
> quiet_cmd_logo = LOGO $@
> - cmd_logo = scripts/pnmtologo \
> + cmd_logo = $(pnmtologo) \
> -t $(patsubst $*_%,%,$(notdir $(basename $<))) \
> -n $(notdir $(basename $<)) -o $@ $<
>
> -$(obj)/%_mono.c: $(src)/%_mono.pbm FORCE
> +$(obj)/%_mono.c: $(src)/%_mono.pbm $(pnmtlogo) FORCE
> $(call if_changed,logo)
>
> -$(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE
> +$(obj)/%_vga16.c: $(src)/%_vga16.ppm $(pnmtlogo) FORCE
> $(call if_changed,logo)
>
> -$(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE
> +$(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtlogo) FORCE
> $(call if_changed,logo)
>
> -$(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE
> +$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtlogo) FORCE
> $(call if_changed,logo)
>
> # Files generated that shall be removed upon make clean

With kind regards,

Geert Uytterhoeven
Software Architect

Sony Techsoft Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: Geert.Uytterhoeven@xxxxxxxxxxx
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/