linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vincent Mailhol <mailhol@kernel.org>
To: Helge Deller <deller@gmx.de>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	 Yoshinori Sato <ysato@users.sourceforge.jp>,
	Rich Felker <dalias@libc.org>,
	 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
	 linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org,
	 Vincent Mailhol <mailhol@kernel.org>
Subject: [PATCH v2 4/6] newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224
Date: Thu, 01 Jan 2026 16:25:18 +0100	[thread overview]
Message-ID: <20260101-custom-logo-v2-4-8eec06dfbf85@kernel.org> (raw)
In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org>

newport_show_logo() is only activated if CONFIG_LOGO_LINUX_CLUT224 is
set (otherwise it is a NOP). This configuration value will be removed
in an upcoming change so instead, make it depend on LOGO_LINUX_CLUT224.

Signed-off-by: Vincent Mailhol <mailhol@kernel.org>
---
 drivers/video/console/newport_con.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 242415366074..337e04236d6d 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -95,7 +95,7 @@ static inline void newport_init_cmap(void)
 
 static const struct linux_logo *newport_show_logo(void)
 {
-#ifdef CONFIG_LOGO_SGI_CLUT224
+#ifdef CONFIG_LOGO_LINUX_CLUT224
 	const struct linux_logo *logo = fb_find_logo(8);
 	const unsigned char *clut;
 	const unsigned char *data;
@@ -127,7 +127,7 @@ static const struct linux_logo *newport_show_logo(void)
 	return logo;
 #else
 	return NULL;
-#endif /* CONFIG_LOGO_SGI_CLUT224 */
+#endif /* CONFIG_LOGO_LINUX_CLUT224 */
 }
 
 static inline void newport_clear_screen(int xstart, int ystart, int xend,

-- 
2.52.0


  parent reply	other threads:[~2026-01-01 15:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-01 15:25 [PATCH v2 0/6] video/logo: allow custom boot logo and simplify logic Vincent Mailhol
2026-01-01 15:25 ` [PATCH v2 1/6] video/logo: remove orphan .pgm Makefile rule Vincent Mailhol
2026-01-01 15:25 ` [PATCH v2 2/6] video/logo: add a type parameter to the logo makefile function Vincent Mailhol
2026-01-01 15:25 ` [PATCH v2 3/6] video/logo: allow custom logo Vincent Mailhol
2026-01-01 15:25 ` Vincent Mailhol [this message]
2026-01-01 15:25 ` [PATCH v2 5/6] sh: defconfig: remove CONFIG_LOGO_SUPERH_* Vincent Mailhol
2026-01-01 15:25 ` [PATCH v2 6/6] video/logo: move logo selection logic to Kconfig Vincent Mailhol

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=20260101-custom-logo-v2-4-8eec06dfbf85@kernel.org \
    --to=mailhol@kernel.org \
    --cc=dalias@libc.org \
    --cc=deller@gmx.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=ysato@users.sourceforge.jp \
    /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;
as well as URLs for NNTP newsgroup(s).