From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) (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 DE89632939F for ; Thu, 8 Jan 2026 19:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=172.105.4.254 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767899188; cv=none; b=BJgOqrvkq15rH9wMvRFT7/lwfJRCOesPfEXDkfG78+jomAWTvF6qt5S84LLEMWlBdRQq9DzRV2YEtbmBqeSw/iElGU0qsgtZIzp0Qaf/iXzIpy28D0gSy1JqlmXBkmTIDaJ8D95duP9nNIsjnCCs9Hmm8KPhi0MEnfGNqBPSjvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767899188; c=relaxed/simple; bh=fijsGqE9CnSJQ1VoVakwrwO9lmzv42xMh3DZyoM14fI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I/mRvkGC5iJeI5TODpboQY6SwR+kXgOrl0mPYriCgeALAaXugT1Xq3Yybmh5S8BVyQ+AeTpli1PmSCUTFfE/s2lE61pJXoGpZnMHmdnkfQ0vmxaeiEaQOarISDP4xTfsZSojsfha0nkWEFO98kqmqKb3EBP98w7Pes68b+E6Nzg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tOiAzfNA; arc=none smtp.client-ip=172.105.4.254 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tOiAzfNA" Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 3F46C60136; Thu, 8 Jan 2026 19:06:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1F55C19423; Thu, 8 Jan 2026 19:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767899181; bh=fijsGqE9CnSJQ1VoVakwrwO9lmzv42xMh3DZyoM14fI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tOiAzfNAiaOBjWEo8cGz1p0576Uopou9/CvdhYtsv666IYwcOhyluM2S/tg2kyzbn rn0PJ/x0XPyk4i4DfA3yZ08vxfn0daJvlGDlQw17aZ25Gt7phaNiOe8pweLk8lcsFT 7pxH3APSUbGDhsPJlEhuMoliLKrTfB6tUt8Hrp6V/GrnpImRdiJCTtsza1vH0kVd07 IIw0f73VShPN+YZbGPmYNd2g4gpQ4skkMAFkZri66Fx80dJF105kvicgJUvd0F2GlJ OqanB7d8An3eJ9DcF1Tu6wGj5iv3cKMjmdCxFGfo17QZlfrsjnIM7WYEXZh4sgE16q W7al2NexjyQkg== From: Vincent Mailhol Date: Thu, 08 Jan 2026 20:04:50 +0100 Subject: [PATCH v3 2/7] video/logo: add a type parameter to the logo makefile function Precedence: bulk X-Mailing-List: linux-m68k@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260108-custom-logo-v3-2-5a7aada7a6d4@kernel.org> References: <20260108-custom-logo-v3-0-5a7aada7a6d4@kernel.org> In-Reply-To: <20260108-custom-logo-v3-0-5a7aada7a6d4@kernel.org> To: Helge Deller , Greg Kroah-Hartman , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Cc: Geert Uytterhoeven , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, linux-m68k@lists.linux-m68k.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=owGbwMvMwCV2McXO4Xp97WbG02pJDJkJDPxVge6J9rLvAvSrNe/1lDnPkp8srRj0vmF+j9vaS ufNa+Q7JrIwiHExWIopsiwr5+RW6Cj0Djv01xJmDisTyBBpkQYGIGBh4MtNzCs10jHSM9U21DM0 1AEyGbg4BWCqZRUY/ifJ/vljuuu82d26T8ecxBOtb840fLIlOl3eaE6NwSF7vu0MfzjbXCYfOV2 m+aL/fvYhkQcB+/Pvm07w4uQu0+tZZWdRygMA 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 := pnmtologo # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo = LOGO $@ - cmd_logo = $(obj)/pnmtologo -t $(lastword $(subst _, ,$*)) -n $* -o $@ $< + cmd_logo = $(obj)/pnmtologo -t $2 -n $* -o $@ $< $(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE - $(call if_changed,logo) + $(call if_changed,logo,mono) -$(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) # generated C files targets += *_mono.c *_vga16.c *_clut224.c -- 2.52.0