Skip to content

Commit e48e9aa

Browse files
committed
added FunKey Recovery boot logo
Signed-off-by: Michel-FK <[email protected]>
1 parent 1667837 commit e48e9aa

File tree

5 files changed

+9614
-2
lines changed

5 files changed

+9614
-2
lines changed

drivers/video/logo/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ config LOGO_FUNKEY_CLUT224
4646
bool "224-color FunKey Linux logo"
4747
default y
4848

49+
config LOGO_FUNKEY_RECOVERY_CLUT224
50+
bool "224-color FunKey Recovery Linux logo"
51+
default n
52+
4953
config LOGO_MAC_CLUT224
5054
bool "224-color Macintosh Linux logo"
5155
depends on MAC

drivers/video/logo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.o
88
obj-$(CONFIG_LOGO_BLACKFIN_CLUT224) += logo_blackfin_clut224.o
99
obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o
1010
obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o
11-
obj-$(CONFIG_LOGO_FUNKE_CLUT224) += logo_funkey_clut224.o
11+
obj-$(CONFIG_LOGO_FUNKEY_CLUT224) += logo_funkey_clut224.o
12+
obj-$(CONFIG_LOGO_FUNKEY_RECOVERY_CLUT224) += logo_funkey_recovery_clut224.o
1213
obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o
1314
obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o
1415
obj-$(CONFIG_LOGO_SGI_CLUT224) += logo_sgi_clut224.o
@@ -17,7 +18,6 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
1718
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
1819
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
1920
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
20-
obj-$(CONFIG_LOGO_FUNKEY_CLUT224) += logo_funkey_clut224.o
2121

2222
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
2323

drivers/video/logo/logo.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ const struct linux_logo * __ref fb_find_logo(int depth)
9090
/* FunKey Linux logo */
9191
logo = &logo_funkey_clut224;
9292
#endif
93+
#ifdef CONFIG_LOGO_FUNKEY_RECOVERY_CLUT224
94+
/* FunKey Recovery Linux logo */
95+
logo = &logo_funkey_recovery_clut224;
96+
#endif
9397
#ifdef CONFIG_LOGO_MAC_CLUT224
9498
/* Macintosh Linux logo on m68k */
9599
if (MACH_IS_MAC)

0 commit comments

Comments
 (0)