Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25722/drivers/video/logo
Modified Files:
Kconfig Makefile logo.c
Log Message:
Merge 2.6.12
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig 3 Mar 2005 21:12:52 -0000 1.2
+++ Kconfig 23 Jun 2005 20:02:21 -0000 1.3
@@ -25,7 +25,7 @@
config LOGO_DEC_CLUT224
bool "224-color Digital Equipment Corporation Linux logo"
- depends on LOGO && MACH_DECSTATION
+ depends on LOGO && (MACH_DECSTATION || ALPHA)
default y
config LOGO_GAMECUBE_CLUT224
@@ -50,7 +50,7 @@
config LOGO_SUN_CLUT224
bool "224-color Sun Linux logo"
- depends on LOGO && (SPARC || SPARC64)
+ depends on LOGO && (SPARC32 || SPARC64)
default y
config LOGO_SUPERH_MONO
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 20 Oct 2004 22:44:24 -0000 1.1
+++ Makefile 23 Jun 2005 20:02:21 -0000 1.2
@@ -24,35 +24,32 @@
# Mono logos
extra-y += $(call logo-cfiles,_mono,pbm)
-quiet_cmd_logo_mono = MONO $@
- cmd_logo_mono = scripts/pnmtologo -t mono -n $*_mono -o $@ $<
-
-$(obj)/%_mono.c: $(src)/%_mono.pbm FORCE
- $(call if_changed,logo_mono)
-
# VGA16 logos
extra-y += $(call logo-cfiles,_vga16,ppm)
-quiet_cmd_logo_vga16 = VGA16 $@
- cmd_logo_vga16 = scripts/pnmtologo -t vga16 -n $*_vga16 -o $@ $<
-
-$(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE
- $(call if_changed,logo_vga16)
-
-#224 Logos
+# 224 Logos
extra-y += $(call logo-cfiles,_clut224,ppm)
-quiet_cmd_logo_clut224 = CLUT224 $@
- cmd_logo_clut224 = scripts/pnmtologo -t clut224 -n $*_clut224 -o $@ $<
-
-$(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE
- $(call if_changed,logo_clut224)
-
# Gray 256
extra-y += $(call logo-cfiles,_gray256,pgm)
-quiet_cmd_logo_gray256 = GRAY256 $@
- cmd_logo_gray256 = scripts/pnmtologo -t gray256 -n $*_gray256 -o $@ $<
+# Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
+quiet_cmd_logo = LOGO $@
+ cmd_logo = scripts/pnmtologo \
+ -t $(patsubst $*_%,%,$(notdir $(basename $<))) \
+ -n $(notdir $(basename $<)) -o $@ $<
+
+$(obj)/%_mono.c: $(src)/%_mono.pbm FORCE
+ $(call if_changed,logo)
+
+$(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE
+ $(call if_changed,logo)
+
+$(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE
+ $(call if_changed,logo)
$(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE
- $(call if_changed,logo_gray256)
+ $(call if_changed,logo)
+
+# Files generated that shall be removed upon make clean
+clean-files := *.o *_mono.c *_vga16.c *_clut224.c *_gray256.c
Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logo.c 20 Oct 2004 22:44:24 -0000 1.1
+++ logo.c 23 Jun 2005 20:02:21 -0000 1.2
@@ -12,6 +12,7 @@
#include <linux/config.h>
#include <linux/linux_logo.h>
#include <linux/stddef.h>
+#include <linux/module.h>
#ifdef CONFIG_M68K
#include <asm/setup.h>
@@ -67,8 +68,10 @@
logo = &logo_linux_clut224;
#endif
#ifdef CONFIG_LOGO_DEC_CLUT224
- /* DEC Linux logo on MIPS/MIPS64 */
+ /* DEC Linux logo on MIPS/MIPS64 or ALPHA */
+#ifndef CONFIG_ALPHA
if (mips_machgroup == MACH_GROUP_DEC)
+#endif
logo = &logo_dec_clut224;
#endif
#ifdef CONFIG_LOGO_GAMECUBE_CLUT224
@@ -102,4 +105,4 @@
}
return logo;
}
-
+EXPORT_SYMBOL_GPL(fb_find_logo);
|
