Commit 3092718e authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Helge Deller
Browse files

video/logo: remove logo_mac_clut224 

The logo_mac_clut224 depends on the runtime value MACH_IS_MAC being
true to be displayed. This makes that logo a one-of-a-kind, as it is
the only one whose selection can not be decided at compile time.

This dynamic logo selection logic conflicts with our upcoming plans to
simplify the logo selection code.

Considering that the logo_mac_clut224 is only used by the Macintosh
68k, a machine whose sales ended some thirty years ago and which thus
represents a very small user base, it is preferable to resolve the
conflict in favour of code simplicity.

Remove the logo_mac_clut224 so that the logo selection can be
statically determined at compile time.

The users who wish to continue using that logo can still download it
from [1] and add:

  CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_LOGO_LINUX_CLUT224_FILE="/path/to/logo_mac_clut224.ppm"

to their configuration file to restore it.

[1] logo_mac_clut224.ppm file
Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/drivers/video/logo/logo_mac_clut224.ppm?h=v6.18



Signed-off-by: default avatarVincent Mailhol <mailhol@kernel.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 9db021e6

drivers/video/logo/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ config LOGO_DEC_CLUT224 
	depends on MACH_DECSTATION || ALPHA

	default y



config LOGO_MAC_CLUT224

	bool "224-color Macintosh Linux logo"

	depends on MAC

	default y



config LOGO_PARISC_CLUT224

	bool "224-color PA-RISC Linux logo"

drivers/video/logo/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o 
obj-$(CONFIG_LOGO_LINUX_VGA16)		+= logo_linux_vga16.o

obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_linux_clut224.o

obj-$(CONFIG_LOGO_DEC_CLUT224)		+= logo_dec_clut224.o

obj-$(CONFIG_LOGO_MAC_CLUT224)		+= logo_mac_clut224.o

obj-$(CONFIG_LOGO_PARISC_CLUT224)	+= logo_parisc_clut224.o

obj-$(CONFIG_LOGO_SGI_CLUT224)		+= logo_sgi_clut224.o

obj-$(CONFIG_LOGO_SUN_CLUT224)		+= logo_sun_clut224.o
@@ -20,7 +19,7 @@ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o 


hostprogs := pnmtologo



# Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."

# Create commands like "pnmtologo -t mono -n logo_linux_mono -o ..."

quiet_cmd_logo = LOGO    $@

      cmd_logo = $(obj)/pnmtologo -t $2 -n $(basename $(notdir $@)) -o $@ $<

drivers/video/logo/logo.c

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) 
		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */

		logo = &logo_dec_clut224;

#endif

#ifdef CONFIG_LOGO_MAC_CLUT224

		/* Macintosh Linux logo on m68k */

		if (MACH_IS_MAC)

			logo = &logo_mac_clut224;

#endif

#ifdef CONFIG_LOGO_PARISC_CLUT224

		/* PA-RISC Linux logo */

		logo = &logo_parisc_clut224;

drivers/video/logo/logo_mac_clut224.ppm

deleted100644 → 0
+0 −1604

File deleted.

Preview size limit exceeded, changes collapsed.

include/linux/linux_logo.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ extern const struct linux_logo logo_linux_mono; 
extern const struct linux_logo logo_linux_vga16;

extern const struct linux_logo logo_linux_clut224;

extern const struct linux_logo logo_dec_clut224;

extern const struct linux_logo logo_mac_clut224;

extern const struct linux_logo logo_parisc_clut224;

extern const struct linux_logo logo_sgi_clut224;

extern const struct linux_logo logo_sun_clut224;