From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48FEB2DE6EF; Thu, 1 Jan 2026 15:25:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281152; cv=none; b=KLveZq8qCZx9rek4p1Db2OssJDYxsGtztBG0r0yujfEJHaRGrMl+NezLP0WkK2t/hISxJvdE04YZOArlCays3aLWZWheidBwmOlpmd2M8vGiK/BPB9+Mv2urDyCDVIbIyvyAYgufP2LuK7YxQ19mbzmjxkuAhJPZMV7FoprQ6/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281152; c=relaxed/simple; bh=/PRAWLk1+pSHIN+oE7HMAv23it2DWPyzsrdtDMwQB9k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ir9n3IOlDwTKwTsjgxXEQ52LP3ZrSWcf9gt+M0sKcbKooiyElajO0XTeN7FtWCC7sIaA8EZ7k1Kc7eDUu1m1bGQDdJfvmeLUBF8qN2plbGRDBh/IjVobMhRj1YgVO+DF83FX725d92Ns/hTRJ+TlQGDXKWzfwG69Ido52V8VPlw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qOu9Gmw/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qOu9Gmw/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79926C16AAE; Thu, 1 Jan 2026 15:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281151; bh=/PRAWLk1+pSHIN+oE7HMAv23it2DWPyzsrdtDMwQB9k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qOu9Gmw/qz5EFdv+hSR2W3VzNET+Zfr9HOgruJn+ydot06HNKv1KjYj0nK9iXJxXV wwD5KcRv2Rqtc6QC9jEgrBbdYfwceeuu1ZHxoh+b834D3L79+ISb4o66mFXNU+Cvpo xcHJXmLnP9eQ8DIyZRP6OK3OaSLWI8xifV4Jfh2QrXGImjTloz0coBGdfInurVfr+Z N0tPNWZQteUmIjTK2ZZp86y6revzzXPOAZh18AfvVvd8f9ECw4gv52xMde02Xyz2Kc 5PeflIPLRTu1H0d/XwHKIWZSddaa85PE74gpg82TYt9s+DzKS7hhKgjhmep8zPEVy3 6XwsmoRhCvdJw== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:15 +0100 Subject: [PATCH v2 1/6] video/logo: remove orphan .pgm Makefile rule Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-1-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=943; i=mailhol@kernel.org; h=from:subject:message-id; bh=/PRAWLk1+pSHIN+oE7HMAv23it2DWPyzsrdtDMwQB9k=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhE5977zg6YfvhbWbLtdZtERBYIBg/j6thn9ZBiahG7 RvuQdF+HRNZGMS4GCzFFFmWlXNyK3QUeocd+msJM4eVCWSItEgDAxCwMPDlJuaVGukY6ZlqG+oZ GuoAmQxcnAIw1XbTGf4K3AxbusiD12/mu9OnN61UsdWJs13et83b+PCbzfczZY5eYvjDb3k9asl 25Zt229nunuDbUqbqeeG1quaHoD3Oh7edFe9lAAA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 The kernel has no actual grey-scale logos. And looking at the git history, it seems that there never was one (or maybe there was in the pre-git history? I did not check that far=E2=80=A6) Remove the Makefile rule for the .pgm grey scale images. Signed-off-by: Vincent Mailhol --- drivers/video/logo/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 895c60b8402e..8b67c4941a4c 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -30,8 +30,5 @@ $(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE $(obj)/%.c: $(src)/%.ppm $(obj)/pnmtologo FORCE $(call if_changed,logo) =20 -$(obj)/%.c: $(src)/%.pgm $(obj)/pnmtologo FORCE - $(call if_changed,logo) - # generated C files -targets +=3D *_mono.c *_vga16.c *_clut224.c *_gray256.c +targets +=3D *_mono.c *_vga16.c *_clut224.c --=20 2.52.0 From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8220C2DE6EF; Thu, 1 Jan 2026 15:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281155; cv=none; b=rK9k4P1nokqjnB0Cm+Pi/++QcmgdvXj21ABdbqz0GOmWJp0xSiSvdA+Z8Xs4Nbur3XNZza8lB9sfuTly4zYU6UGHIQYYlSAOCGRtXGLGDvcrvRYfgntrLF8/CrDt8dYQhT5wgeBRxvax3DLtRinvn4h6tIRgIpyIpZhd6YSwJpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281155; c=relaxed/simple; bh=fijsGqE9CnSJQ1VoVakwrwO9lmzv42xMh3DZyoM14fI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BfOWtgOqWWVHUGNi7JtnFEbvPogaGgkkWRo0swNwEQlZIXB6e/ck1nhoqAgJKswJ7iPrTR/HmEw9BETeK8itrzs0VEMMFSbhZMUcdS9FWFIRMRs+IxJ/+15BI826rafemyIod+yF7O+5zQ2AuW2Lv4D0/2j7Uy6qiTtWR1f3LI8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XHpt5GHv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XHpt5GHv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D26CC19421; Thu, 1 Jan 2026 15:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281155; bh=fijsGqE9CnSJQ1VoVakwrwO9lmzv42xMh3DZyoM14fI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XHpt5GHvJM5qyOMGNvH8tFwBLclultMO+0e9mRiefgmeD2oRld8Mc2vrErss3UoPu PPYy953ONhx2hrS7ifHOJ9SwBUU/eJo/q+v82ieqe6BuKdwcS3N07kOh/SFgUGV8wy iOmAUs4X5UT703wn91pEaDq4H2G1qU2WocAPEgJ4a6EU278Pvvyz62hFEZXr14sZlh UJgqeiFV5jFCIsuMJX+FqeQE556eL8Ja1YZtUc5CEaJrD1SWSbwSmIMm/Ydg+xXWvc mXB2MNjF9Pv2P79ebnxX4ce6nDInnsVvIhtBBOJJeOIcdmba5Z4bvG55eTQtpbJBU8 7RextR4pm4HXw== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:16 +0100 Subject: [PATCH v2 2/6] video/logo: add a type parameter to the logo makefile function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-2-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1618; i=mailhol@kernel.org; h=from:subject:message-id; bh=fijsGqE9CnSJQ1VoVakwrwO9lmzv42xMh3DZyoM14fI=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhE1+Fm9nU2cT9XLwgRuHtadbvBxLyQrx1Mtt/SuxkO 16nVMXcMZGFQYyLwVJMkWVZOSe3Qkehd9ihv5Ywc1iZQIZIizQwAAELA19uYl6pkY6Rnqm2oZ6h oQ6QycDFKQBTHXCb4X8Jz9zP1V3KPS9kDSLmPUu/6Bdr/E20sINR8NMuXu9NiisYGZqX+e+zcD3 uvuL7icv/LL3lZ04MnLOov/zM15q3ni6fz3AAAA== X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 When translating a portable pixmap file into a .c file, the pnmtologo tool expects to receive the image type (either mono, vga16 or clut224) as an argument under the -t option. Currently, this information is stored in the file name. Because we will allow for custom logo in an upcoming change, it is preferable to decouple the image name from its type. Add a new $2 parameter to the Makefile logo function which contains the image type. Update all the individual targets to provide this new argument. Signed-off-by: Vincent Mailhol --- drivers/video/logo/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 8b67c4941a4c..3f249e9dcf37 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -22,13 +22,16 @@ hostprogs :=3D pnmtologo =20 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo =3D LOGO $@ - cmd_logo =3D $(obj)/pnmtologo -t $(lastword $(subst _, ,$*)) -n $* -= o $@ $< + cmd_logo =3D $(obj)/pnmtologo -t $2 -n $* -o $@ $< =20 $(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE - $(call if_changed,logo) + $(call if_changed,logo,mono) =20 -$(obj)/%.c: $(src)/%.ppm $(obj)/pnmtologo FORCE - $(call if_changed,logo) +$(obj)/%_vga16.c: $(src)/%_vga16.ppm $(obj)/pnmtologo FORCE + $(call if_changed,logo,vga16) + +$(obj)/%_clut224.c: $(src)/%_clut224.ppm $(obj)/pnmtologo FORCE + $(call if_changed,logo,clut224) =20 # generated C files targets +=3D *_mono.c *_vga16.c *_clut224.c --=20 2.52.0 From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B670D2DE6FA; Thu, 1 Jan 2026 15:25:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281158; cv=none; b=aczP/yT2UudHkLKTHnw4nSHd6pR8UuaE4na89n6XrTH8vs3m/RUzBalR71HnS2zBK6pvw2aSDdobcPgGCDiKpuILoSu8cBkGtVcx4GMGd6pXW8Efsdgx6UWIaq+8C0xtMkaLWElW6vmEBl3qUXKWL7zxTAPSn3GQfKMtiWuWvfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281158; c=relaxed/simple; bh=gtqLKaPEROvOwx883495hrk9NUNwDLHOl6hXc0CN0IQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NLepYTxufpgj2jMERjp4yE9mAHBIBKlr2a+uOB++LFkaXjSUm4FFuLOTaYQ6IN4AUOJfBSOOD6WKBXerMQV0JarqmKp4AeG5gDySbUqiJgs6RqtxHAnTt9v/6+g8Pi0i63P+N/Axwwbq3k0Ml9FlW6ZyHBqgmeUzg1iwgj3x540= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MiB8/56D; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MiB8/56D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C8DAC4CEF7; Thu, 1 Jan 2026 15:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281158; bh=gtqLKaPEROvOwx883495hrk9NUNwDLHOl6hXc0CN0IQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MiB8/56Do1UMk1qmOfyDoZN+vq969Zm1beOb3u3NUPVqJ5GgD6nmAGCzHENPiania 4BRR6iMpRPHt0EuvZnLiS62q8J/zk57bU2Hg2ZxAYRbqkYqajWYWF67aCUbrkrFemM cRfR0666dKRYEHQ0Vx95Y8tilGvrpQpjTRBYDg7q+Yl7s5x8PcCqZ1ACHT3JwJiBFk Tzx61LxkIfH3K8U5q+JAnhAoyViBhYycRh5i8+cvYGGHm5AUneZ+OCun49DAMX/rdd jjH2PMdPdF5CZq0SbkQND3MiQQVvvWVWhWrSxLR1GshWmuXn2g8cDlYczKLjWxAv/j eSIEfvQRNTq4A== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:17 +0100 Subject: [PATCH v2 3/6] video/logo: allow custom logo Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-3-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4512; i=mailhol@kernel.org; h=from:subject:message-id; bh=gtqLKaPEROvOwx883495hrk9NUNwDLHOl6hXc0CN0IQ=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhE9/qzFj0TW+6lN/aw3UtlVc1p5Z0Gl7v2GHZ3lnNk 8H3ef6sjoksDGJcDJZiiizLyjm5FToKvcMO/bWEmcPKBDJEWqSBAQhYGPhyE/NKjXSM9Ey1DfUM DXWATAYuTgGY6nOaDP8L/t8NVmmL27N5T/bas/fulQaqvqubyrDo573uCQEhm1+UMPz32CY58V+ gdq31dfdG/j7f4q1CZUv27rz685daVHWyjxQTAA== X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 Some people like to replace the default Tux boot logo by an image of their own. There exist a few tutorials here [1] and there [2]. But this requires modifying the sources which is a bit cumbersome. Add a string entry in Kbuild for each of the logo categories (monochrome, 16-colors, 224-colors). The string entry takes a path to a .pbm or .ppm image allowing the user to more easily provide a custom logo without having to modify the sources. Add an help entry with a short hint on how to convert images to the portable pixmap file format. Update the Makefile accordingly. When converted to .c file, the logo will have one of these fixed file name: - logo_linux_mono.c - logo_linux_vga16.c - logo_linux_clut224.c: depending on the image type and this regardless of the name of the .pgm/.ppm source filename. This will allow for further simplifications in an upcoming change. [1] ArmadeuS Project wiki -- Linux Boot Logo Link: https://www.armadeus.org/wiki/index.php?title=3DLinux_Boot_Logo [2] Timesys -- How To Use a Custom Boot Logo / Splash Screen Link: https://linuxlink.timesys.com/docs/wiki/engineering/HOWTO_Use_a_custo= m_boot_logo Signed-off-by: Vincent Mailhol --- drivers/video/logo/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++ drivers/video/logo/Makefile | 11 ++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index ce6bb753522d..1d1651c067a1 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -22,14 +22,55 @@ config LOGO_LINUX_MONO bool "Standard black and white Linux logo" default y =20 +config LOGO_LINUX_MONO_FILE + string "Monochrome logo .pbm file" + depends on LOGO_LINUX_MONO + default "drivers/video/logo/logo_linux_mono.pbm" + help + Takes a path to a monochromatic logo in the portable pixmap file + format (.pbm). This defaults to the Tux penguin. + + For example, the below ImageMagick command can be used to reduce + an image to black and white and convert it into a pbm file: + + magick source_image -compress none destination.pbm + config LOGO_LINUX_VGA16 bool "Standard 16-color Linux logo" default y =20 +config LOGO_LINUX_VGA16_FILE + string "16-color logo .ppm file" + depends on LOGO_LINUX_VGA16 + default "drivers/video/logo/logo_linux_vga16.ppm" + help + Takes a path to a logo in the portable pixmap file format (.ppm), + using the 16 colors from the drivers/video/logo/clut_vga16.ppm + palette. This defaults to the Tux penguin. + + For example, the below ImageMagick command can be used to reduce an + image to the VGA 16 colors palette and convert into a ppm file: + + magick source_image -compress none \ + -remap drivers/video/logo/clut_vga16.ppm destination.ppm + config LOGO_LINUX_CLUT224 bool "Standard 224-color Linux logo" default y =20 +config LOGO_LINUX_CLUT224_FILE + string "224-color logo .ppm file" + depends on LOGO_LINUX_CLUT224 + default "drivers/video/logo/logo_linux_clut224.ppm" + help + Takes a path to a 224-color logo in the portable pixmap file + format (.ppm). This defaults to the Tux penguin. + + For example, the below ImageMagick command can be used to reduce + an image palette to 224 colors and convert it into a ppm file: + + magick source_image -compress none -colors 224 destination.ppm + config LOGO_DEC_CLUT224 bool "224-color Digital Equipment Corporation Linux logo" depends on MACH_DECSTATION || ALPHA diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 3f249e9dcf37..ac8e9da3f51a 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -22,7 +22,16 @@ hostprogs :=3D pnmtologo =20 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo =3D LOGO $@ - cmd_logo =3D $(obj)/pnmtologo -t $2 -n $* -o $@ $< + cmd_logo =3D $(obj)/pnmtologo -t $2 -n $(basename $(notdir $@)) -o $= @ $< + +$(obj)/logo_linux_mono.c: $(CONFIG_LOGO_LINUX_MONO_FILE) $(obj)/pnmtologo = FORCE + $(call if_changed,logo,mono) + +$(obj)/logo_linux_vga16.c: $(CONFIG_LOGO_LINUX_VGA16_FILE) $(obj)/pnmtolog= o FORCE + $(call if_changed,logo,vga16) + +$(obj)/logo_linux_clut224.c: $(CONFIG_LOGO_LINUX_CLUT224_FILE) $(obj)/pnmt= ologo FORCE + $(call if_changed,logo,clut224) =20 $(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE $(call if_changed,logo,mono) --=20 2.52.0 From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E26B02DE703; Thu, 1 Jan 2026 15:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281162; cv=none; b=k0f7LOd9qdEN8vfdjO0FsKbM8RITmjzx+9hBgXfU9MgXwGR7yB6T3fNu95DYdzb438TL6CpkjC5zJB/cnvY4wiz3gqw9ugt8Knsd39qf8QkffJE/4ckjjcsJtPePK/KvCzzqewtGlbXGXLjz2G1wRpS6sh46DmpAR4QmY647FKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281162; c=relaxed/simple; bh=DavTlH0i9MWegO1iqCZhDEQs4kTEOYsr1j0ik1iUucI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dXCocqBKwZyMdG4If93G5r+jc8nITtTtgPVGIKV9Zef6a2NUwe9Ce6g4WLKYtZgcC2hABj3UCxxqOQVwpkWx0XrZ56hqlTWuz5ubF0I0jtpQQH/TfSxGWBynTj61yg20g7cR2MQjXPi+tVMQBwDZCylgPGcOeeGESIwo0zOMUBM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=INc/V7iI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="INc/V7iI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC566C16AAE; Thu, 1 Jan 2026 15:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281161; bh=DavTlH0i9MWegO1iqCZhDEQs4kTEOYsr1j0ik1iUucI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=INc/V7iIyFxHMxq3DVYPQ0wfABOKnmNuMRBJx3qFcam1sPuVHc6h12n4bCOt5oX9Q 0PIq05cyfqUzmhQgrSSTkvhrW7HASy7krE3OMjGLFuVA6+5EdHJ2MCUHgzQlV/kPT3 YhH8o3AxYyTty5ctPmvUCvTUMHGS+b5Svmd0i3/GCcAoBy2kQgW6VQDwGx0ndUDdpL BxbOeQqF2Zdkq+V/HpzxheCaHVizWonZLAmZ6dTKvXHDCa/QWqLRW8JaLQHJFkip9b 877gfJLLzq7BZvGMMogAgRm4FLc/KTqIf8QWqvRv/5NR9FgsLW9y+XOjC9hzxxQNMY dhL5cv9wMU/Ow== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:18 +0100 Subject: [PATCH v2 4/6] newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-4-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1191; i=mailhol@kernel.org; h=from:subject:message-id; bh=DavTlH0i9MWegO1iqCZhDEQs4kTEOYsr1j0ik1iUucI=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhEz9cjl3OeEkz/9eu7TazfnUwHDTm7Gh/pcstWL7V9 saGDWI2HRNZGMS4GCzFFFmWlXNyK3QUeocd+msJM4eVCWSItEgDAxCwMPDlJuaVGukY6ZlqG+oZ GuoAmQxcnAIw1VcSGRlaIg+Y96rZNBhzqV299lfK7XZn0cxvnxhfOMzUPhXIrZHEyHBTOeSu69F A6eXOytuu9Xd2W9kZyS9V/Wj7af5WV7XCzzwA X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 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 --- 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/ne= wport_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) =20 static const struct linux_logo *newport_show_logo(void) { -#ifdef CONFIG_LOGO_SGI_CLUT224 +#ifdef CONFIG_LOGO_LINUX_CLUT224 const struct linux_logo *logo =3D 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 */ } =20 static inline void newport_clear_screen(int xstart, int ystart, int xend, --=20 2.52.0 From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17C1A2DE6F3; Thu, 1 Jan 2026 15:26:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281165; cv=none; b=pUaeLu7dTgEtn89A6Z7Pua93e3eALADainvRWVLO73BPbLUb4xJHfENa/E6YBaMEwl8Jf5/gspZIePmtJKm/RPbSWIA40FwkeWXY3heSR0JPZA3Of/6KDofYO0jIuTrdVrXoFd2R8WI2bstv8eV2eSfa5qZGfbaRxKdX2lff9YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281165; c=relaxed/simple; bh=c9rs47Rq9JsGR2S4cjbA10der3BMDGHlAJIPw4Woy/o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L1Ojl7EiO34vOsISKRJ5Bnoex8ffu6G4Fp37VfQuDeBq9NFBA5KmurluEJDjGpLs3zmzuG32wY7UO7IvKaScMkpFABwmiZ5Zb7mzIzEXvbMATuLjz1WMlu/U838yeZvHT2s6Sq7PljHv5IY18CmRCVwNi0Xodg+3omw2PS8FsUk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ss2CuzqI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ss2CuzqI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07D62C19423; Thu, 1 Jan 2026 15:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281164; bh=c9rs47Rq9JsGR2S4cjbA10der3BMDGHlAJIPw4Woy/o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ss2CuzqIjsc6+WbNYlMSXZia6DjiHdiscnwEoIUyFEOBxAbphyT9C7NutJ+90eHx1 KY2SdMpmhYXuLcaXXPr/bVHKElfE5Id8TzUuH4cTCwnuZrO3aJhfrMGgg3xDmXWaFD ccfW1m3DcxJ8ONzwtFs5IcdFmak17yR5NWcpi9yzDBUS0m5LEmYo+h7gsGqYMUTwSV LVWEPEw7n6bJdnNi90dn4ADnVA8cQmCnHhanmOWWlqnJZFld7n0tsQv4OgYXi+YCLX iFL3ox/K+w1RMDXIiDn/W82yC49gpQlrUbYS3z2HMiGdahjf5txUUfZGWYlYa055v8 x/leN1R8DRp9Q== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:19 +0100 Subject: [PATCH v2 5/6] sh: defconfig: remove CONFIG_LOGO_SUPERH_* Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-5-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5952; i=mailhol@kernel.org; h=from:subject:message-id; bh=c9rs47Rq9JsGR2S4cjbA10der3BMDGHlAJIPw4Woy/o=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhEz+vlA0r8Sz3vPBO/t+eusPvj5mvyFh/6ekt3U/qT 3qubZL73zGRhUGMi8FSTJFlWTknt0JHoXfYob+WMHNYmUCGSIs0MAABCwNfbmJeqZGOkZ6ptqGe oaEOkMnAxSkAU628gpHhH/u6uh+HBM8FTbG5mlqmoukgErHPfFfcWq98gaSS+4cMGP6ZHLwx/9s V13POytpLqsRjUk9znH7o89bnQc3tXUKi245wAAA= X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 CONFIG_LOGO_SUPERH_MONO, CONFIG_LOGO_SUPERH_VGA16 and CONFIG_LOGO_SUPERH_CLUT224 will be removed in an upcoming change but are still referenced in some of the defconfig. Remove all the occurrences of CONFIG_LOGO_SUPERH_*. Signed-off-by: Vincent Mailhol --- arch/sh/configs/dreamcast_defconfig | 2 -- arch/sh/configs/ecovec24_defconfig | 2 -- arch/sh/configs/kfr2r09_defconfig | 2 -- arch/sh/configs/migor_defconfig | 2 -- arch/sh/configs/rts7751r2d1_defconfig | 2 -- arch/sh/configs/rts7751r2dplus_defconfig | 2 -- arch/sh/configs/se7724_defconfig | 2 -- arch/sh/configs/se7780_defconfig | 2 -- arch/sh/configs/sh7785lcr_defconfig | 3 --- arch/sh/configs/urquell_defconfig | 3 --- 10 files changed, 22 deletions(-) diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcas= t_defconfig index 4573d5d64989..dd58797e8298 100644 --- a/arch/sh/configs/dreamcast_defconfig +++ b/arch/sh/configs/dreamcast_defconfig @@ -60,8 +60,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set # CONFIG_DNOTIFY is not set CONFIG_PROC_KCORE=3Dy CONFIG_TMPFS=3Dy diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_= defconfig index 458115d83184..e751933ac840 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_defconfig @@ -78,8 +78,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set CONFIG_SOUND=3Dy CONFIG_SND=3Dy CONFIG_SND_SEQUENCER=3Dy diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_de= fconfig index d80e83e7ec38..056ba52600f9 100644 --- a/arch/sh/configs/kfr2r09_defconfig +++ b/arch/sh/configs/kfr2r09_defconfig @@ -66,8 +66,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_CLUT224 is not set CONFIG_USB_GADGET=3Dy CONFIG_USB_CDC_COMPOSITE=3Dm CONFIG_MMC=3Dy diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defcon= fig index 7cdaa909ffd6..1d9d543eef4c 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig @@ -71,8 +71,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_CLUT224 is not set CONFIG_USB_GADGET=3Dy CONFIG_USB_GADGET_M66592=3Dy CONFIG_USB_G_SERIAL=3Dm diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts775= 1r2d1_defconfig index 0c54ab2b06e6..745490d4807f 100644 --- a/arch/sh/configs/rts7751r2d1_defconfig +++ b/arch/sh/configs/rts7751r2d1_defconfig @@ -50,8 +50,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set CONFIG_SOUND=3Dy CONFIG_SND=3Dm CONFIG_SND_YMFPCI=3Dm diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts= 7751r2dplus_defconfig index 3173b616b2cb..cd90f5354459 100644 --- a/arch/sh/configs/rts7751r2dplus_defconfig +++ b/arch/sh/configs/rts7751r2dplus_defconfig @@ -55,8 +55,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set CONFIG_SOUND=3Dy CONFIG_SND=3Dm CONFIG_SND_YMFPCI=3Dm diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defc= onfig index 8ca46d704c8b..9b4f8f3a1fdf 100644 --- a/arch/sh/configs/se7724_defconfig +++ b/arch/sh/configs/se7724_defconfig @@ -79,8 +79,6 @@ CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set CONFIG_SOUND=3Dy CONFIG_SND=3Dm # CONFIG_SND_DRIVERS is not set diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defc= onfig index 12463b766120..13fa6a59b8f1 100644 --- a/arch/sh/configs/se7780_defconfig +++ b/arch/sh/configs/se7780_defconfig @@ -66,8 +66,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=3Dy CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set CONFIG_SOUND=3Dy CONFIG_SOUND_PRIME=3Dy CONFIG_HID_A4TECH=3Dy diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lc= r_defconfig index 2fcf50d8c820..8738c590d5a0 100644 --- a/arch/sh/configs/sh7785lcr_defconfig +++ b/arch/sh/configs/sh7785lcr_defconfig @@ -60,9 +60,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=3Dy CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set -# CONFIG_LOGO_SUPERH_CLUT224 is not set CONFIG_HID_A4TECH=3Dy CONFIG_HID_APPLE=3Dy CONFIG_HID_BELKIN=3Dy diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_de= fconfig index f51ff6b1ec38..e7924db29b69 100644 --- a/arch/sh/configs/urquell_defconfig +++ b/arch/sh/configs/urquell_defconfig @@ -86,9 +86,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=3Dy CONFIG_LOGO=3Dy # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_SUPERH_MONO is not set -# CONFIG_LOGO_SUPERH_VGA16 is not set -# CONFIG_LOGO_SUPERH_CLUT224 is not set CONFIG_HID_A4TECH=3Dy CONFIG_HID_APPLE=3Dy CONFIG_HID_BELKIN=3Dy --=20 2.52.0 From nobody Mon Feb 9 05:52:52 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44D742DE703; Thu, 1 Jan 2026 15:26:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281168; cv=none; b=D9jvNYiUdHlHVQ1zoHfAr34WrTbcJDUOXpK5Eu78KDPfKV5gG/ueN4RlDYTGOjCDZFbmbGDLhJCj0MILKvxatCvSyuzGX8EUtabvGRvgaw4lOofGy08yu0ldZdSUvBoB5gcqJ8jtMfktX2lSVJQIIm5B6Y0/ob8LqP6FGPhscbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767281168; c=relaxed/simple; bh=RB7GSPILpxEDFgqeq3nph2Z8WzcKMaUP8bzsVTQHrdA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pKjsNO0BPP9jhKmugMMFFOYdIN66SnfzZ5rcaRUP7D6FR6hhegs2Ym5gDEfJOlHbgG5Cee4MlOVfC15ZrMpayNCTklqPEjXrdDRmnENsK2weulYEV0Bh/2/jPJMMLm8YtA0kCg0lbJ2c10LFOrw9MOtlV2m+9JIXCCljBhQF13E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kSicxtcx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kSicxtcx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37512C19421; Thu, 1 Jan 2026 15:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767281167; bh=RB7GSPILpxEDFgqeq3nph2Z8WzcKMaUP8bzsVTQHrdA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kSicxtcxafAfnTnnk3UicDagIAv1QJrpz2+HcZk3ZqArSNnraVEOJ3izDJA5dSyMp GQlirMSQdmcs5yFP8mQOTn4nDiNniMWYR2nWZZlmaTypyquoGCcCJ1cjknCufxMbdp cRuG0vZ9AZMGJBcCCk3qOj4dnt+kSufKdCM/00jdZiLHI0SqV2YzVuaZWaYNhLGRie 3fxz+U1NssQit04rXKjk/AF03Oh4GrQQKMq4IuiA1L2Q6Z80VmLY60LEIR+QmuCTiM qtZJBjdqEDzDN8TtMnkVcz9uYsZdp9s3l7KaXzFbc4fhN8jWza8DD/FEMpFdNZ5wpG ueqPkzMhsE2Nw== From: Vincent Mailhol Date: Thu, 01 Jan 2026 16:25:20 +0100 Subject: [PATCH v2 6/6] video/logo: move logo selection logic to Kconfig Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-custom-logo-v2-6-8eec06dfbf85@kernel.org> References: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> In-Reply-To: <20260101-custom-logo-v2-0-8eec06dfbf85@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Vincent Mailhol X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8170; i=mailhol@kernel.org; h=from:subject:message-id; bh=RB7GSPILpxEDFgqeq3nph2Z8WzcKMaUP8bzsVTQHrdA=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJlhE7/pGK6WOOY4S+zwooYza/xN2p/sWngqZGMxs//xj v0NTg6VHRNZGMS4GCzFFFmWlXNyK3QUeocd+msJM4eVCWSItEgDAxCwMPDlJuaVGukY6ZlqG+oZ GuoAmQxcnAIw1WK8DP8Tbm9fXF9vpjZ5pfj/t+6vj64Uk+T/EHDG/PSkA/WJv8yMGBlWvrf+czX S9ETFRltzd+2uDEFb/3NxWeWNQestDn1LaGYCAA== X-Developer-Key: i=mailhol@kernel.org; a=openpgp; fpr=ED8F700574E67F20E574E8E2AB5FEB886DBB99C2 Now that the path to the logo file can be directly entered in Kbuild, there is no more need to handle all the logo file selection in the Makefile and the C files. The only exception is the logo_spe_clut224 which is only used by the Cell processor (found for example in the Playstation 3) [1]. This extra logo uses its own different image which shows up on a separate line just below the normal logo. Because the extra logo uses a different image, it can not be factorized under the custom logo logic. Move all the logo file selection logic to Kbuild (except from the logo_spe_clut224.ppm), this done, clean-up the C code to only leave one entry for each logo type (monochrome, 16-colors and 224-colors). [1] Cell SPE logos Link: https://lore.kernel.org/all/20070710122702.765654000@pademelon.sonyte= l.be/ Signed-off-by: Vincent Mailhol --- **Changelog** v1 -> v2: - By removing the logo_spe_clut224.o target from the Makefile, v1 also removed the logo_spe_clut224 object which is still being referenced in arch/powerpc/platforms/cell/spu_base.c Restore the logo_spe_clut224.o target. Link: https://lore.kernel.org/all/20251230-custom-logo-v1-6-4736374569ee@ke= rnel.org/ --- drivers/video/logo/Kconfig | 48 ++++++++---------------------------------= ---- drivers/video/logo/Makefile | 14 ------------- drivers/video/logo/logo.c | 46 ++++-------------------------------------= -- include/linux/linux_logo.h | 8 -------- 4 files changed, 12 insertions(+), 104 deletions(-) diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 1d1651c067a1..af9301ebc51c 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -25,6 +25,7 @@ config LOGO_LINUX_MONO config LOGO_LINUX_MONO_FILE string "Monochrome logo .pbm file" depends on LOGO_LINUX_MONO + default "drivers/video/logo/logo_superh_mono.pbm" if SUPERH default "drivers/video/logo/logo_linux_mono.pbm" help Takes a path to a monochromatic logo in the portable pixmap file @@ -42,6 +43,7 @@ config LOGO_LINUX_VGA16 config LOGO_LINUX_VGA16_FILE string "16-color logo .ppm file" depends on LOGO_LINUX_VGA16 + default "drivers/video/logo/logo_superh_vga16.ppm" if SUPERH default "drivers/video/logo/logo_linux_vga16.ppm" help Takes a path to a logo in the portable pixmap file format (.ppm), @@ -61,6 +63,12 @@ config LOGO_LINUX_CLUT224 config LOGO_LINUX_CLUT224_FILE string "224-color logo .ppm file" depends on LOGO_LINUX_CLUT224 + default "drivers/video/logo/logo_dec_clut224.ppm" if MACH_DECSTATION || A= LPHA + default "drivers/video/logo/logo_mac_clut224.ppm" if MAC + default "drivers/video/logo/logo_parisc_clut224.ppm" if PARISC + default "drivers/video/logo/logo_sgi_clut224.ppm" if SGI_IP22 || SGI_IP27= || SGI_IP32 + default "drivers/video/logo/logo_sun_clut224.ppm" if SPARC + default "drivers/video/logo/logo_superh_clut224.ppm" if SUPERH default "drivers/video/logo/logo_linux_clut224.ppm" help Takes a path to a 224-color logo in the portable pixmap file @@ -71,44 +79,4 @@ config LOGO_LINUX_CLUT224_FILE =20 magick source_image -compress none -colors 224 destination.ppm =20 -config LOGO_DEC_CLUT224 - bool "224-color Digital Equipment Corporation Linux logo" - 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" - depends on PARISC - default y - -config LOGO_SGI_CLUT224 - bool "224-color SGI Linux logo" - depends on SGI_IP22 || SGI_IP27 || SGI_IP32 - default y - -config LOGO_SUN_CLUT224 - bool "224-color Sun Linux logo" - depends on SPARC - default y - -config LOGO_SUPERH_MONO - bool "Black and white SuperH Linux logo" - depends on SUPERH - default y - -config LOGO_SUPERH_VGA16 - bool "16-color SuperH Linux logo" - depends on SUPERH - default y - -config LOGO_SUPERH_CLUT224 - bool "224-color SuperH Linux logo" - depends on SUPERH - default y - endif # LOGO diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index ac8e9da3f51a..0eddb6231edb 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -5,14 +5,6 @@ obj-$(CONFIG_LOGO) +=3D logo.o obj-$(CONFIG_LOGO_LINUX_MONO) +=3D logo_linux_mono.o obj-$(CONFIG_LOGO_LINUX_VGA16) +=3D logo_linux_vga16.o obj-$(CONFIG_LOGO_LINUX_CLUT224) +=3D logo_linux_clut224.o -obj-$(CONFIG_LOGO_DEC_CLUT224) +=3D logo_dec_clut224.o -obj-$(CONFIG_LOGO_MAC_CLUT224) +=3D logo_mac_clut224.o -obj-$(CONFIG_LOGO_PARISC_CLUT224) +=3D logo_parisc_clut224.o -obj-$(CONFIG_LOGO_SGI_CLUT224) +=3D logo_sgi_clut224.o -obj-$(CONFIG_LOGO_SUN_CLUT224) +=3D logo_sun_clut224.o -obj-$(CONFIG_LOGO_SUPERH_MONO) +=3D logo_superh_mono.o -obj-$(CONFIG_LOGO_SUPERH_VGA16) +=3D logo_superh_vga16.o -obj-$(CONFIG_LOGO_SUPERH_CLUT224) +=3D logo_superh_clut224.o =20 obj-$(CONFIG_SPU_BASE) +=3D logo_spe_clut224.o =20 @@ -33,12 +25,6 @@ $(obj)/logo_linux_vga16.c: $(CONFIG_LOGO_LINUX_VGA16_FIL= E) $(obj)/pnmtologo FORC $(obj)/logo_linux_clut224.c: $(CONFIG_LOGO_LINUX_CLUT224_FILE) $(obj)/pnmt= ologo FORCE $(call if_changed,logo,clut224) =20 -$(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE - $(call if_changed,logo,mono) - -$(obj)/%_vga16.c: $(src)/%_vga16.ppm $(obj)/pnmtologo FORCE - $(call if_changed,logo,vga16) - $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(obj)/pnmtologo FORCE $(call if_changed,logo,clut224) =20 diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index 141f15a9a459..91535f8848da 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -48,59 +48,21 @@ const struct linux_logo * __ref fb_find_logo(int depth) if (nologo || logos_freed) return NULL; =20 - if (depth >=3D 1) { #ifdef CONFIG_LOGO_LINUX_MONO - /* Generic Linux logo */ + if (depth >=3D 1) logo =3D &logo_linux_mono; #endif -#ifdef CONFIG_LOGO_SUPERH_MONO - /* SuperH Linux logo */ - logo =3D &logo_superh_mono; -#endif - } =09 - if (depth >=3D 4) { #ifdef CONFIG_LOGO_LINUX_VGA16 - /* Generic Linux logo */ + if (depth >=3D 4) logo =3D &logo_linux_vga16; #endif -#ifdef CONFIG_LOGO_SUPERH_VGA16 - /* SuperH Linux logo */ - logo =3D &logo_superh_vga16; -#endif - } =09 - if (depth >=3D 8) { #ifdef CONFIG_LOGO_LINUX_CLUT224 - /* Generic Linux logo */ + if (depth >=3D 8) logo =3D &logo_linux_clut224; #endif -#ifdef CONFIG_LOGO_DEC_CLUT224 - /* DEC Linux logo on MIPS/MIPS64 or ALPHA */ - logo =3D &logo_dec_clut224; -#endif -#ifdef CONFIG_LOGO_MAC_CLUT224 - /* Macintosh Linux logo on m68k */ - if (MACH_IS_MAC) - logo =3D &logo_mac_clut224; -#endif -#ifdef CONFIG_LOGO_PARISC_CLUT224 - /* PA-RISC Linux logo */ - logo =3D &logo_parisc_clut224; -#endif -#ifdef CONFIG_LOGO_SGI_CLUT224 - /* SGI Linux logo on MIPS/MIPS64 */ - logo =3D &logo_sgi_clut224; -#endif -#ifdef CONFIG_LOGO_SUN_CLUT224 - /* Sun Linux logo */ - logo =3D &logo_sun_clut224; -#endif -#ifdef CONFIG_LOGO_SUPERH_CLUT224 - /* SuperH Linux logo */ - logo =3D &logo_superh_clut224; -#endif - } + return logo; } EXPORT_SYMBOL_GPL(fb_find_logo); diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h index e37699b7e839..1e727a2cb4c1 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h @@ -33,14 +33,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_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; -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_spe_clut224; =20 extern const struct linux_logo *fb_find_logo(int depth); --=20 2.52.0