From: Arnd Bergmann <arnd@arndb.de>
To: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org
Subject: [PATCH 16/47] video/logo: remove obsolete logo files
Date: Wed, 14 Mar 2018 16:35:29 +0100 [thread overview]
Message-ID: <20180314153603.3127932-17-arnd@arndb.de> (raw)
In-Reply-To: <20180314153603.3127932-1-arnd@arndb.de>
The blackfin and m32r architectures are getting removed, so it's
time to clean up the logos as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/video/logo/Kconfig | 15 -
drivers/video/logo/Makefile | 3 -
drivers/video/logo/logo.c | 12 -
drivers/video/logo/logo_blackfin_clut224.ppm | 1127 ----------------------
drivers/video/logo/logo_blackfin_vga16.ppm | 1127 ----------------------
drivers/video/logo/logo_m32r_clut224.ppm | 1292 --------------------------
include/linux/linux_logo.h | 3 -
7 files changed, 3579 deletions(-)
delete mode 100644 drivers/video/logo/logo_blackfin_clut224.ppm
delete mode 100644 drivers/video/logo/logo_blackfin_vga16.ppm
delete mode 100644 drivers/video/logo/logo_m32r_clut224.ppm
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 0037104d66ac..d1f6196c8b9a 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -27,16 +27,6 @@ config LOGO_LINUX_CLUT224
bool "Standard 224-color Linux logo"
default y
-config LOGO_BLACKFIN_VGA16
- bool "16-colour Blackfin Processor Linux logo"
- depends on BLACKFIN
- default y
-
-config LOGO_BLACKFIN_CLUT224
- bool "224-colour Blackfin Processor Linux logo"
- depends on BLACKFIN
- default y
-
config LOGO_DEC_CLUT224
bool "224-color Digital Equipment Corporation Linux logo"
depends on MACH_DECSTATION || ALPHA
@@ -77,9 +67,4 @@ config LOGO_SUPERH_CLUT224
depends on SUPERH
default y
-config LOGO_M32R_CLUT224
- bool "224-color M32R Linux logo"
- depends on M32R
- default y
-
endif # LOGO
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index 6194373ee424..228a89b9bdd1 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -5,8 +5,6 @@ obj-$(CONFIG_LOGO) += logo.o
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_BLACKFIN_CLUT224) += logo_blackfin_clut224.o
-obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.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
@@ -15,7 +13,6 @@ obj-$(CONFIG_LOGO_SUN_CLUT224) += logo_sun_clut224.o
obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
-obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 4d50bfd13e7c..36aa050f9a21 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -63,10 +63,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */
logo = &logo_linux_vga16;
#endif
-#ifdef CONFIG_LOGO_BLACKFIN_VGA16
- /* Blackfin processor logo */
- logo = &logo_blackfin_vga16;
-#endif
#ifdef CONFIG_LOGO_SUPERH_VGA16
/* SuperH Linux logo */
logo = &logo_superh_vga16;
@@ -78,10 +74,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */
logo = &logo_linux_clut224;
#endif
-#ifdef CONFIG_LOGO_BLACKFIN_CLUT224
- /* Blackfin Linux logo */
- logo = &logo_blackfin_clut224;
-#endif
#ifdef CONFIG_LOGO_DEC_CLUT224
/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
logo = &logo_dec_clut224;
@@ -107,10 +99,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* SuperH Linux logo */
logo = &logo_superh_clut224;
#endif
-#ifdef CONFIG_LOGO_M32R_CLUT224
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
-#endif
}
return logo;
}
diff --git a/drivers/video/logo/logo_blackfin_clut224.ppm b/drivers/video/logo/logo_blackfin_clut224.ppm
deleted file mode 100644
index dc9a50a14477..000000000000
diff --git a/drivers/video/logo/logo_blackfin_vga16.ppm b/drivers/video/logo/logo_blackfin_vga16.ppm
deleted file mode 100644
index 1352b02a9d93..000000000000
diff --git a/drivers/video/logo/logo_m32r_clut224.ppm b/drivers/video/logo/logo_m32r_clut224.ppm
deleted file mode 100644
index 8b2983c5a0bd..000000000000
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index 5e3581d76c7f..d4d5b93efe84 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -36,8 +36,6 @@ struct linux_logo {
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_blackfin_vga16;
-extern const struct linux_logo logo_blackfin_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;
@@ -46,7 +44,6 @@ extern const struct linux_logo logo_sun_clut224;
extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
-extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224;
extern const struct linux_logo *fb_find_logo(int depth);
--
2.9.0
next prev parent reply other threads:[~2018-03-14 15:42 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 15:35 [PATCH 00/47] arch-removal: device drivers Arnd Bergmann
2018-03-14 15:35 ` [PATCH 01/47] edac: remove tile driver Arnd Bergmann
2018-03-14 15:48 ` Borislav Petkov
2018-03-15 10:03 ` Mauro Carvalho Chehab
2018-03-14 15:35 ` [PATCH 02/47] net: tile: remove ethernet drivers Arnd Bergmann
2018-03-14 15:35 ` [PATCH 03/47] net: adi: remove blackfin " Arnd Bergmann
2018-03-14 15:35 ` [PATCH 04/47] net: 8390: remove m32r specific bits Arnd Bergmann
2018-03-14 15:35 ` [PATCH 05/47] net: remove cris etrax ethernet driver Arnd Bergmann
2018-03-15 12:19 ` Jesper Nilsson
2018-03-14 15:35 ` [PATCH 06/47] net: smsc: remove m32r specific smc91x configuration Arnd Bergmann
2018-03-14 15:45 ` Nicolas Pitre
2018-03-15 4:58 ` Finn Thain
2018-03-15 8:07 ` Arnd Bergmann
2018-03-14 15:35 ` [PATCH 07/47] raid: remove tile specific raid6 implementation Arnd Bergmann
2018-03-14 16:49 ` Ard Biesheuvel
2018-03-14 15:35 ` [PATCH 08/47] rtc: remove tile driver Arnd Bergmann
2018-03-14 18:14 ` Alexandre Belloni
2018-03-14 15:35 ` [PATCH 09/47] rtc: remove bfin driver Arnd Bergmann
2018-03-14 18:14 ` Alexandre Belloni
2018-03-14 15:35 ` [PATCH 10/47] char: remove obsolete ds1302 rtc driver Arnd Bergmann
2018-03-14 16:34 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 11/47] char: remove tile-srom.c Arnd Bergmann
2018-03-14 16:34 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 12/47] char: remove blackfin OTP driver Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 13/47] pcmcia: remove m32r drivers Arnd Bergmann
2018-03-14 20:37 ` Dominik Brodowski
2018-03-14 15:35 ` [PATCH 14/47] pcmcia: remove blackfin driver Arnd Bergmann
2018-03-14 15:35 ` [PATCH 15/47] ASoC: remove blackfin drivers Arnd Bergmann
2018-03-14 16:12 ` Mark Brown
2018-03-14 16:26 ` Arnd Bergmann
2018-03-14 16:26 ` Arnd Bergmann
2018-03-14 15:35 ` Arnd Bergmann [this message]
2018-03-15 13:35 ` [PATCH 16/47] video/logo: remove obsolete logo files Bartlomiej Zolnierkiewicz
2018-03-14 15:35 ` [PATCH 17/47] fbdev: remove blackfin drivers Arnd Bergmann
2018-03-15 13:37 ` Bartlomiej Zolnierkiewicz
2018-03-14 15:35 ` [PATCH 18/47] fbdev: s1d13xxxfb: remove m32r specific hacks Arnd Bergmann
2018-03-15 13:41 ` Bartlomiej Zolnierkiewicz
2018-03-14 15:35 ` [PATCH 19/47] crypto: remove blackfin CRC driver Arnd Bergmann
2018-03-23 16:02 ` Herbert Xu
2018-03-14 15:35 ` [PATCH 20/47] media: platform: remove blackfin capture driver Arnd Bergmann
2018-03-15 10:03 ` Mauro Carvalho Chehab
2018-03-14 15:35 ` [PATCH 21/47] media: platform: remove m32r specific arv driver Arnd Bergmann
2018-03-15 10:04 ` Mauro Carvalho Chehab
2018-03-14 15:35 ` [PATCH 22/47] cpufreq: remove blackfin driver Arnd Bergmann
2018-03-15 2:47 ` Viresh Kumar
2018-03-14 15:35 ` [PATCH 23/47] cpufreq: remove cris specific drivers Arnd Bergmann
2018-03-15 2:47 ` Viresh Kumar
2018-03-15 12:19 ` Jesper Nilsson
2018-03-14 15:35 ` [PATCH 24/47] gpio: remove etraxfs driver Arnd Bergmann
2018-03-26 16:29 ` Linus Walleij
2018-03-14 15:35 ` [PATCH 25/47] pinctrl: remove adi2/blackfin drivers Arnd Bergmann
2018-03-26 16:30 ` Linus Walleij
2018-03-14 15:35 ` [PATCH 26/47] ata: remove bf54x driver Arnd Bergmann
2018-03-14 15:50 ` Tejun Heo
2018-03-14 15:35 ` [PATCH 27/47] input: keyboard: " Arnd Bergmann
2018-03-14 16:04 ` Dmitry Torokhov
2018-03-14 15:35 ` [PATCH 28/47] input: misc: remove blackfin rotary driver Arnd Bergmann
2018-03-14 16:04 ` Dmitry Torokhov
2018-03-14 15:35 ` [PATCH 29/47] mmc: remove bfin_sdh driver Arnd Bergmann
2018-03-14 17:07 ` Ulf Hansson
2018-03-14 15:35 ` [PATCH 30/47] can: remove bfin_can driver Arnd Bergmann
2018-03-14 15:35 ` [PATCH 31/47] watchdog: remove bfin_wdt driver Arnd Bergmann
2018-03-14 16:06 ` Guenter Roeck
2018-03-14 15:35 ` [PATCH 32/47] mtd: maps: remove bfin-async-flash driver Arnd Bergmann
2018-03-14 15:35 ` [PATCH 33/47] mtd: nand: remove bf5xx_nand driver Arnd Bergmann
2018-03-14 15:35 ` [PATCH 34/47] spi: remove blackfin related host drivers Arnd Bergmann
2018-03-14 16:17 ` Mark Brown
2018-03-14 15:35 ` [PATCH 35/47] i2c: remove bfin-twi driver Arnd Bergmann
2018-03-17 20:19 ` Wolfram Sang
2018-03-14 15:35 ` [PATCH 36/47] pwm: remobe pwm-bfin driver Arnd Bergmann
2018-03-14 16:38 ` Thierry Reding
2018-03-14 16:44 ` Arnd Bergmann
2018-03-14 15:35 ` [PATCH 37/47] usb: host: remove tilegx platform glue Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 16:44 ` Alan Stern
2018-03-14 15:35 ` [PATCH 38/47] usb: musb: remove blackfin port Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 17:12 ` Bin Liu
2018-03-15 14:17 ` Arnd Bergmann
2018-03-14 15:35 ` [PATCH 39/47] usb: isp1362: remove blackfin arch glue Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 40/47] serial: remove cris/etrax uart drivers Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-15 12:19 ` Jesper Nilsson
2018-03-14 15:35 ` [PATCH 41/47] serial: remove blackfin drivers Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 42/47] serial: remove m32r_sio driver Arnd Bergmann
2018-03-14 16:33 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 43/47] serial: remove tile uart driver Arnd Bergmann
2018-03-14 16:32 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 44/47] tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers Arnd Bergmann
2018-03-14 16:32 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 45/47] tty: hvc: remove tile driver Arnd Bergmann
2018-03-14 16:32 ` Greg Kroah-Hartman
2018-03-14 15:35 ` [PATCH 46/47] staging: irda: remove bfin_sir driver Arnd Bergmann
2018-03-14 16:32 ` Greg Kroah-Hartman
2018-03-14 16:35 ` Arnd Bergmann
2018-03-14 15:36 ` [PATCH 47/47] staging: iio: remove iio-trig-bfin-timer driver Arnd Bergmann
2018-03-14 16:32 ` Greg Kroah-Hartman
2018-03-14 17:06 ` Jonathan Cameron
2018-03-14 20:24 ` Arnd Bergmann
2018-03-14 22:45 ` [PATCH 00/47] arch-removal: device drivers Rafael J. Wysocki
2018-03-15 5:32 ` Boris Brezillon
2018-03-15 9:09 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180314153603.3127932-17-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®