From nobody Sat Feb 7 12:19:19 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 E11D023B63F; Tue, 30 Dec 2025 22:20:30 +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=1767133231; cv=none; b=Ntq9pT9bNKNJKBWILbLf9tRGO90KPE+cuin4KJ5wxLIodT1IqTKAKxpMnMfI97pl4Was5XDZ78pLJX6ij+ntpfGdCMkgyore0H8660imb7yOz1GSWdb7t/BDGthctXEMiIoYU7QR0RX1odQtlLt5uP2vBs7eNtDgBE8rmlhuX60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133231; c=relaxed/simple; bh=6I1rEjCG98kdXTPmhTpC3Bn5VqMKhdxPrgp53PclCTE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aqSpEOPSj5cgg5rvWRiQ3d55sCfePIm21W8BRhcVvKQNjT6hoL6x/fJ/pWk1wrYFtiYtmTsl0d2dUthcAFR/B4YG+m9eb39249U0++n9ua7Tx5uHIXo4VYsRy4ous8Uo0o6yh37D2iyiFle55eT/B/EoywgIj2x0TdwnLp4D8Xw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=heaprSRu; 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="heaprSRu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF47AC16AAE; Tue, 30 Dec 2025 22:20:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133230; bh=6I1rEjCG98kdXTPmhTpC3Bn5VqMKhdxPrgp53PclCTE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=heaprSRuplV4FHuNIOHD+RI8xFWZsEThLI98xpea+vlBo2wemVEZMxnz7bP1c2fOa Lk+7iWx0WQcSc5/p1wiX7zd/bO6v7CVvaTH38pvnqtPIClg894tnjsxqxkymkmpw+K 430haaHolWTSgMlZIr/kY3xlLonijVWsyTpr84y6dGk4JfWtP4TYMnwYHdsBRASRdA giLkM6qBWWhxh52X2ApS3c7YPCCLZMcnLJIHJ4mcxJTFe0/y6259Znd61dzhT/sAiU h1zQaX56hqITSNUXNffPiLfn/OvQWDx7S0i03x53lgrYwbw2fV/4kIy/i7O3fdiuiI pOwatwMC3R4Jw== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:00 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-1-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=6I1rEjCG98kdXTPmhTpC3Bn5VqMKhdxPrgp53PclCTE=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhAWLXFKf84vZ1fND7fqbuwww1ptBnJsKzdb3q47a89 pgTyJzWMZGFQYyLwVJMkWVZOSe3Qkehd9ihv5Ywc1iZQIZIizQwAAELA19uYl6pkY6Rnqm2oZ6h oQ6QycDFKQBT7f2KkWHLEnbmKas+2xsu2OD1WCNvfZ6xfBB3+a/webfuLmd5nzmJ4Z8+D+Nuo6k F/3/ZZHz3rJATvHrqZdHb0w2/A4/3zp5d+ZgbAA== 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.51.2 From nobody Sat Feb 7 12:19:19 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 EA05223B63F; Tue, 30 Dec 2025 22:20:33 +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=1767133234; cv=none; b=E5cwS/CwtnIazRdHmsEG4dANP+JLVQc6XSsR9yo7+c6XJhXCt56SDFsdAZvjeXRj/yx4Ks0iHSoOlSiRlKJAUoADeCRaN7Zj4wM8SL3aCbYtG4hisAwQ0oCCxIJChvOi1EMSgCTkPixFaEwxafM3V/EWnfWHic1mLFt+WD6vs4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133234; c=relaxed/simple; bh=oiaT6aLlR+Lw7QjGCokHCw+7kOpOxkIL1yAAgjdQAoU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ehJhKGdMamE49wvk78xHPbnC25QNN5c/5BK0JzAKGbHaCgn5YzHhf/YgfrTv20ZiPk/4Alr7GMCeVpGfhGIrOl3UyX7nM2VJ55eCeo7iIKc/KSe0SVgP1hCOphBHghFv65GdC1XXpHuFiQR3duRAM8lTYfs6hgy5KHO569mZ6j0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uAvcTXId; 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="uAvcTXId" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE644C4CEFB; Tue, 30 Dec 2025 22:20:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133233; bh=oiaT6aLlR+Lw7QjGCokHCw+7kOpOxkIL1yAAgjdQAoU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uAvcTXId1+g5SoDSBHxwipcS05pcotNbHjxY0/gUbt85pfEuo+DqBzQso++znZBvy RDbJ901DGoC74xAsh+we+FSPRnbdkMWa4bYvrI3yITFXQ2PQFZ7Pv7mnAJQ2iseZ8W lAB/cVUsQmkskCgEyP7IKbVXDZbi7EsjkDMt0r7q48DxLfng8X8wBBbTcYY8hGqVky G5hxHGcSbIjrazxelbyAQ4JsHzyMHdizIFsFOJTF99uZ2ill1rA5RfMC3kBEP7rP+9 AL+Zx6KjSzX7VGMODH/jU3h/xAKHoG1Wm9xSiFYGnf2vMe9vyQuZ2pAJEgmCyDwkNS 0HZ0gsUYjX5cA== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:01 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-2-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=1715; i=mailhol@kernel.org; h=from:subject:message-id; bh=oiaT6aLlR+Lw7QjGCokHCw+7kOpOxkIL1yAAgjdQAoU=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhAZLRHmGmG87kxcWFZWvMZ/ycbma37f8Ji3dZKbbHu vwflV/vmMjCIMbFYCmmyLKsnJNboaPQO+zQX0uYOaxMIEOkRRoYgICFgS83Ma/USMdIz1TbUM/Q UAfIZODiFICpdp/MyHC5qZ99WXhttc6c14G70w6UfzS4s++PNJ/gu1lzz0ntqZ7GyNDiYTvh16x rHzRfnlD8xxL9ZG2S1pnnjE5iBpNX+diUnOQEAA== 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. Note that this transitional: all those targets will be removed in an upcoming clean-up change. 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.51.2 From nobody Sat Feb 7 12:19:19 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 03BE52BE047; Tue, 30 Dec 2025 22:20:36 +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=1767133237; cv=none; b=pjrYbsmyHqUmjiIZXqHIdEIiFXfMp1EGhnDAY6OyAs+lwtfywoaJmdsZaJcbcjJaCIIE8bltyHtYM5kKC1F3C0HGG4c1nsKzAcN/LcsxOj0f7+t3seOEgDnIxSOFbd5UMAaZKzfE5GigjEJ7lp1JUqMGc146sSVbPvdd2QRqY5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133237; c=relaxed/simple; bh=BRZrgSxN1NJzubewUZVXvkoGwaDjniOa8PxjKgCPGas=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WSxzoaUZMs3Sm6bog56khdz0OsaTT73jMAwxy7DE+BWv//RkeKdZ/5o1YmKT9Jn3D2/MTvGITJJyFp8WI88fyOYTY6CsByq0vYo9kBal+YSNu1NmcDc3ipoQlxabLYVGnjFPAHooIN6MLySdUqVESm4wrdy3j76pMixjCu1GWvk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UfhEbz2Q; 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="UfhEbz2Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BECFC113D0; Tue, 30 Dec 2025 22:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133236; bh=BRZrgSxN1NJzubewUZVXvkoGwaDjniOa8PxjKgCPGas=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=UfhEbz2QPsUeopf7kJoN85E+yVT31HPyzjYszz8w54Sg/btk0DRAT/BN7DSmv1aw1 1Ggjjej7LC1Z67sHUpbOCJvZbzzgFiRIbcCvCJXA/FiO5uGfS0XCzoYWpIOttvPIID hNx9fGUnfgXaOhC3CIvhio5xiARWDfIxzSA9rQJONyhxU1TrUO5/Opf52EMvfg5dNP 1ewM/o3pfWFA8pSETVgTkdbOh6XTdGvm13tFKZhTeU1G5CphSMs+tjppuXAX2EzLMb z36gBrn7i9dxTKENr6SSSegFzO2IjD1S2iXbFbhHkLaeEjc9QesH/c4oyDVshxv9Di w3Z1LR99+3s0w== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:02 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-3-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=BRZrgSxN1NJzubewUZVXvkoGwaDjniOa8PxjKgCPGas=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhATKNumqpPQ0p0gtYZ3vb8nxRXPfW2u42S9ukvmjdo H/OjOkdE1kYxLgYLMUUWZaVc3IrdBR6hx36awkzh5UJZIi0SAMDELAw8OUm5pUa6RjpmWob6hka 6gCZDFycAjDVZgsYGY4vSuF/y577JeLfrucfftjcyW22kUj2Xdkf/VF1wp7L3q8Z/oqUSJ2eMGl Zq5/sCk/r6ded8w4+eFUSunJz5jPOv3FLzrABAA== 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.51.2 From nobody Sat Feb 7 12:19:19 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 1DB68296BCC; Tue, 30 Dec 2025 22:20:39 +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=1767133240; cv=none; b=BcrpdCdyZFdF2mGzFnoXCa3dxaFSRRFes7Y1joR452jl3qS6sX5H3wduxpwTHUyXXJevajOL5XVvVj6cf0xxFZOyywUtRuE0ZH3EKVBlxZqKDew4V4MKETAcc1b2PXouowd7MX5Wn8sq22ecoyiscNDcp4p2ZCJrMKmiLlJSNWo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133240; c=relaxed/simple; bh=93HYu28vnLOJFYlzQk99DQQ03zwR1Rvm0sI/c4BZlec=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NA5eX9qzsLnqgZjn0wccj+hcQWp1p52YDPtVDERom3cX/XzvCO8irlEZmibmS5GxwChcaP29I8Yk2ADL22+M0evApdgoKraoUTiIbgBHVEnec62MTjZEjwqmqnzu+FeGlatc9yaVc0EytMUYN2FayqojuNsNfvXsKQdHF6fWrj4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HC8w2CDe; 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="HC8w2CDe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D999C16AAE; Tue, 30 Dec 2025 22:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133239; bh=93HYu28vnLOJFYlzQk99DQQ03zwR1Rvm0sI/c4BZlec=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HC8w2CDewlFHvWeaOfy1pvO/G1dg9AWJQ/lAyq0YK8ImyxhYm/d4VcC+16QQ89t9/ VoF0WeBIYSz4Y7RSt0v2AXNWzM/Hl48GuyAyBemFPJQUWTXqJGBPsLTDQGwHjAIeiI ixfqC96alZ1TUTv5k0WfdFTZ+vwE7QqgevKvU8eimKQ29VfHY/O1LQEj7MKygmc31S PJcqx6sOB1xuzcc5JyqM0bnk08hMb9+I9LBZvSvODv7Efw1ZU0Nc8okDsBw3EAwoaN fsz8sGweS3tbZugGcfHoye0S4Lm2ZSCD7Tyb74nnS/8+5GJmjgAqDL4a5zOXr7BiHp gOwSFcWAeGNew== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:03 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-4-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=93HYu28vnLOJFYlzQk99DQQ03zwR1Rvm0sI/c4BZlec=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhAfLSrzMCFy861jOpryTlj0Pnymuh6eqNP6XEX+6O1 a+cK7WkYyILgxgXg6WYIsuyck5uhY5C77BDfy1h5rAygQ0RaWAAAhYGvtzEvFIjHSM9U21DPUND HSCTgYtTAKZ60wFGhs17tmSpeWia8xswfyhW9jlf0Sxiv3Blxp/SFQHTnq21e83IsK3rm5X466N vi9tDbd4G/BDmu6kY2VcZ+bCMc6Oq5LM/TAA= 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.51.2 From nobody Sat Feb 7 12:19:19 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 73E21296BCC; Tue, 30 Dec 2025 22:20:43 +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=1767133243; cv=none; b=HJbTsSIS4Mt5/vPBsFaGoR7cfbOBO9+2oyvTFLys1p5O9BO5PVuIKGV/BlaMd3LfH+yhnL2DM5q8e4gaD/YYqAroTx0WZwlAy/Id9YzpeFtrG5I1CF/QE3Wn/JCslUPpNLI2WgSe1ksivrNN0lVie3y54q0UoLd+/fC0/a2xzEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133243; c=relaxed/simple; bh=OowWnBnPJi35UDwr7fkXyoZ8aMBWQLWLSRM5Amye2+Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bg6da8oVDm57tmqWRRRTNf5ehkcFuYcwTeL2A/r56a899PNhqjAI1eH0iXOLeTNfZuzQPNDFbWGpS4rWG77ju58MaOlCTieutpCLKdwPEQRtHsVKqcNjRJ13baKxig9mAc6vTeObW48w8SObAQgrXrAOhbxPaB5KLtmbJLyMxYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RCVQ8XMA; 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="RCVQ8XMA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D5D3C19422; Tue, 30 Dec 2025 22:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133243; bh=OowWnBnPJi35UDwr7fkXyoZ8aMBWQLWLSRM5Amye2+Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RCVQ8XMAoQu+YmQe6H012hjKEwVtp4/e9b8mRQCvsgJihh1B7u+twKQoeqObT9NYM al+LJthi3Ls2gg4L7wVcpXz4Tfd4SR3PK/6+BVaNOdsF45yo7cGpjWcIDoPvxuR5Nr 79edTnw6uT0RvspEh7e/1GibGyRW3sShnKWaJPzdhlauwl8BTbKDeKONxKZSiBy9gL Pp93yPRipJvTKwlughl6jjskt4RpKLsRTmb62iJOLgQ36GgHcr4UOmnXefJ9MFxnLw R0ydrTZoSz/aou7KuIjo/SLcJp7ZZkUOknY6tFIqfi6o2CaBRIsjYLO6rg4cOtbuqQ X9UijHzPip8+A== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:04 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-5-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=OowWnBnPJi35UDwr7fkXyoZ8aMBWQLWLSRM5Amye2+Q=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhAUrvnqyuv5x3ueLvnb3bf8l+u3tOtXRShOBjmfuye RNjHJVNOyayMIhxMViKKbIsK+fkVugo9A479NcSZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNQBMhm4OAVgqiesZfifIKvS9fj9i3nLYg+yJFqb97M7C5oU3xRiO7DmlljJjlXyjAwtV6yl90j WzKmy+XKpTOlPrKrMo3efKjQMvdo+Mxd2FnEBAA== 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.51.2 From nobody Sat Feb 7 12:19:19 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 A62A32BD597; Tue, 30 Dec 2025 22:20:46 +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=1767133246; cv=none; b=Rh8BojDwz+HrBbi3+RyrYtB/No6gYtzCouqmAcPzDrRNSROUG4vNLtkNo9LtS8VDTkv1t2T+lC3B0mkNkGxio1g1uSxxmTjKOiOmouV2I3OwiNom5voN7v1j1JgBQ7UZgSJ37Xv72h/8V0cLqt1a72JOcYOHKd0cSfk6SzHxkFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767133246; c=relaxed/simple; bh=NNCSULr2nRdE2yYWQR8DwWPhpf7lqz4No+9QPkhz7fU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rcSqVN5+b5njMRyeXA0TYm7oJm8JqmxgbzH57uvEQJLxOLt/f5Tej2mCbeDOHPAVdVgjDMUngBFBc9EP795ITeJGQ0zWiC3R4RTsbczHzCVRDaDezJ+CNRk1zUl5EBZk7gml52beJc/zpabaPjUClg404DZ5CSYIK9Iw3WvvmU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qRkcgSNB; 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="qRkcgSNB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CAC0C113D0; Tue, 30 Dec 2025 22:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767133246; bh=NNCSULr2nRdE2yYWQR8DwWPhpf7lqz4No+9QPkhz7fU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qRkcgSNBcPguuY/ndScjetUz8gZf8VpwWDvFBamXau7VLtAbdMkNLh01o3MQ2J4Av hKlGkm5KtQ5ke73AyNbnnYSuA9zJGjzT9++tV1ePxHiUf4x94uYEyhV6EtBLvEkMkM yZA8m1F9DepWU9UB5WLP8XzJ4ctPsdqBQd5OYxzWL9kCmC+O6qy6ZEZNtOeqwOf2oE QeQ4z3MJIXvHedHMOfL/vfkFqw3MelRceuDF80y9ghUaKjmD9aycuAZsZG5LcOCAxm JLsHzNNEzFElRklwGf4ru6VMTXULscVvhcshXV3C6szO9GxCfHj1/Qd3jQbj5GJ0Nf r7RTo8WIiI6pQ== From: Vincent Mailhol Date: Tue, 30 Dec 2025 23:20:05 +0100 Subject: [PATCH 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: <20251230-custom-logo-v1-6-4736374569ee@kernel.org> References: <20251230-custom-logo-v1-0-4736374569ee@kernel.org> In-Reply-To: <20251230-custom-logo-v1-0-4736374569ee@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=7578; i=mailhol@kernel.org; h=from:subject:message-id; bh=NNCSULr2nRdE2yYWQR8DwWPhpf7lqz4No+9QPkhz7fU=; b=owGbwMvMwCV2McXO4Xp97WbG02pJDJkhAarP5c2f/p45d23xMpentp8lQy57Wdz1NPCv17F92 ma/RIurYyILgxgXg6WYIsuyck5uhY5C77BDfy1h5rAygQyRFmlgAAIWBr7cxLxSIx0jPVNtQz1D Qx0gk4GLUwCm2vQVI0PfxNsMe27uk1M8yRhwjV17pwZb3vrKNfssn4X+l+j4szKRkaHXjUmqYxN jgtLs/VmXTkgEH1E4GlqlHud6/MOBZdJPtnMCAA== 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. Move all the logo file selection logic to Kbuild, this done, clean-up the C code to only leave one entry for each logo type (monochrome, 16-colors and 224-colors). Signed-off-by: Vincent Mailhol --- drivers/video/logo/Kconfig | 49 +++++++++--------------------------------= ---- drivers/video/logo/Makefile | 21 +------------------ drivers/video/logo/logo.c | 46 ++++-------------------------------------- include/linux/linux_logo.h | 9 --------- 4 files changed, 14 insertions(+), 111 deletions(-) diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 1d1651c067a1..9bf8f14c6856 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,13 @@ 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_spe_clut224.ppm" if SPU_BASE default "drivers/video/logo/logo_linux_clut224.ppm" help Takes a path to a 224-color logo in the portable pixmap file @@ -71,44 +80,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..c32238fddaa6 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -5,16 +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 - -obj-$(CONFIG_SPU_BASE) +=3D logo_spe_clut224.o =20 # How to generate logo's =20 @@ -33,14 +23,5 @@ $(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) - # generated C files -targets +=3D *_mono.c *_vga16.c *_clut224.c +targets +=3D logo_linux_mono.c logo_linux_vga16.c logo_linux_clut224.c 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..d5a66af27fd9 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h @@ -33,15 +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); #ifdef CONFIG_FB_LOGO_EXTRA --=20 2.51.2