From patchwork Wed Aug 21 03:55:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EE5913A4 for ; Wed, 21 Aug 2019 04:00:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4245C22CF7 for ; Wed, 21 Aug 2019 04:00:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="BeqOvx+l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725283AbfHUEA5 (ORCPT ); Wed, 21 Aug 2019 00:00:57 -0400 Received: from condef-09.nifty.com ([202.248.20.74]:21167 "EHLO condef-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725268AbfHUEA4 (ORCPT ); Wed, 21 Aug 2019 00:00:56 -0400 Received: from conuserg-07.nifty.com ([10.126.8.70])by condef-09.nifty.com with ESMTP id x7L3tuUG000726 for ; Wed, 21 Aug 2019 12:55:56 +0900 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L3tQp2016439; Wed, 21 Aug 2019 12:55:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L3tQp2016439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566359728; bh=vmQBAhaSJK2tNhLoMYDnGiXN0DBL3oiw2A5oHUe77Co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BeqOvx+l3wYKOpFmrXRx1YZKFYf6ISYrjN9OdzhjVHLKdfQN0n0wuYwOrJYUwddl5 IlfxPZXvkek1mxO5aTudwFQULJ2hZ4BDH/3wP4sjE2UAA93cyoz5zaJehikzqVdw3N Yp+5SOK656uLWcByPD+FV6Jcg7FmZb2AtwIZrtiWcTptreC03qSXMW7yB5783v7002 EzrPjw6X/Ne+Ks9i0bMDS0pE/PWc0OLqlA4d5ggQARTuimoS7HV152sh+OxV+o6n2T 4nSeM3Xy7OtJXWNwyTcHtdn6qZFt7/UakXm1PUGi11zuKNRlk4UsKMdet1KM9Dx4aH 8SW25SFooxCZQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Geert Uytterhoeven , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] video/logo: remove unneeded *.o pattern from clean-files Date: Wed, 21 Aug 2019 12:55:13 +0900 Message-Id: <20190821035517.21671-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821035517.21671-1-yamada.masahiro@socionext.com> References: <20190821035517.21671-1-yamada.masahiro@socionext.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The pattern *.o is cleaned up globally by the top Makefile. Signed-off-by: Masahiro Yamada --- drivers/video/logo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 228a89b9bdd1..10b75ce3ce09 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -56,4 +56,4 @@ $(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE $(call if_changed,logo) # Files generated that shall be removed upon make clean -clean-files := *.o *_mono.c *_vga16.c *_clut224.c *_gray256.c +clean-files := *_mono.c *_vga16.c *_clut224.c *_gray256.c From patchwork Wed Aug 21 03:55:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6927914F7 for ; Wed, 21 Aug 2019 03:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 470D822CF7 for ; Wed, 21 Aug 2019 03:59:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="Wa3+nU5B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727253AbfHUD7k (ORCPT ); Tue, 20 Aug 2019 23:59:40 -0400 Received: from condef-06.nifty.com ([202.248.20.71]:57555 "EHLO condef-06.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbfHUD7j (ORCPT ); Tue, 20 Aug 2019 23:59:39 -0400 Received: from conuserg-07.nifty.com ([10.126.8.70])by condef-06.nifty.com with ESMTP id x7L3ts03019642 for ; Wed, 21 Aug 2019 12:55:54 +0900 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L3tQp3016439; Wed, 21 Aug 2019 12:55:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L3tQp3016439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566359728; bh=xvzRaJpfAiuO+5/j+Hz3YB5Qx9ImeceBGGq+CyKuQ7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wa3+nU5BGO15eyxz0lR5bIn9rwZ+2mjRIYim+iLMokOLIkpJs39HjD4Myi/Ao98hq x6P5m2dqGM4Xs0ynb4eSTpu4eZsabnZi25M6MOLBeSNSHbW+ltJYl0ZKKi1WC/nswO FWDm5tNeP5UZkEWbjqdkmoQ2LNBTw9iLkQPVKpL0YVte6K6Sri3igN7yzfqCEn6LHB oQlnxf/gVIikOijXjjvndkr7dj1LJg3ci3pfshNAIIVPjKftzdxGc7wuB9etDJENDI IbufhIOK0fj85Nb9hHEaxwiA9YWkA1ks0y+m+H6wZP9RTuPnkXwfrFhBqWvxKmO9pr JKUI+JjrERlkA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Geert Uytterhoeven , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] video/logo: fix unneeded generation of font C files Date: Wed, 21 Aug 2019 12:55:14 +0900 Message-Id: <20190821035517.21671-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821035517.21671-1-yamada.masahiro@socionext.com> References: <20190821035517.21671-1-yamada.masahiro@socionext.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Currently, all the font C files are generated irrespective of CONFIG options. Adding them to extra-y is wrong. What we need to do here is to add them to 'targets' so that if_changed works properly. All files listed in 'targets' are cleaned, so clean-files is unneeded. Signed-off-by: Masahiro Yamada --- drivers/video/logo/Makefile | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 10b75ce3ce09..16f60c1e1766 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -18,23 +18,6 @@ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o # How to generate logo's -# Use logo-cfiles to retrieve list of .c files to be built -logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ - $(wildcard $(srctree)/$(src)/*$(1).$(2)))) - - -# Mono logos -extra-y += $(call logo-cfiles,_mono,pbm) - -# VGA16 logos -extra-y += $(call logo-cfiles,_vga16,ppm) - -# 224 Logos -extra-y += $(call logo-cfiles,_clut224,ppm) - -# Gray 256 -extra-y += $(call logo-cfiles,_gray256,pgm) - pnmtologo := scripts/pnmtologo # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." @@ -55,5 +38,5 @@ $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE $(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE $(call if_changed,logo) -# Files generated that shall be removed upon make clean -clean-files := *_mono.c *_vga16.c *_clut224.c *_gray256.c +# generated C files +targets += *_mono.c *_vga16.c *_clut224.c *_gray256.c From patchwork Wed Aug 21 03:55:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105369 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A30BC14DE for ; Wed, 21 Aug 2019 04:02:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FBE322CF7 for ; Wed, 21 Aug 2019 04:02:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="CGTM9Ip8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725268AbfHUECI (ORCPT ); Wed, 21 Aug 2019 00:02:08 -0400 Received: from condef-03.nifty.com ([202.248.20.68]:47864 "EHLO condef-03.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727065AbfHUECI (ORCPT ); Wed, 21 Aug 2019 00:02:08 -0400 Received: from conuserg-07.nifty.com ([10.126.8.70])by condef-03.nifty.com with ESMTP id x7L3tuqe020946 for ; Wed, 21 Aug 2019 12:55:56 +0900 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L3tQp4016439; Wed, 21 Aug 2019 12:55:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L3tQp4016439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566359729; bh=6fHkMxqT3+v0CE4zyYlxI6pTvIRPi8TKT8Z20L42FeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CGTM9Ip8o61zeqHGDHeQK9RgclVA0dIXBS0WTjDmQzDmdx6VqjNALxNsUNKVlLh/s wQHaHeqEOTciWRofraKElz+DdJTipiVlPP50NKlLPgWLJrV9ny/9Ja7dAh5XudxAIS JLi3xQG00ucSqQwts31QadViT0zDqYJoUWEohMiDxynNpGmKR8ybqAmOOwlpnnFvQC cNe0MQsqEvIXeRP6yD7BTt+VM0yh9xgK6hIwDAyMoW8BmLBaKBw82B//jbgKYBBBTw oqx7PkXwOM93RByfRyHrPGHjRcRq4aEkjc7IKp0K7zrqekUX9s7dPUUr1Nga8nMRc1 9Hr24AH+ql5mQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Geert Uytterhoeven , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] video/logo: simplify cmd_logo Date: Wed, 21 Aug 2019 12:55:15 +0900 Message-Id: <20190821035517.21671-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821035517.21671-1-yamada.masahiro@socionext.com> References: <20190821035517.21671-1-yamada.masahiro@socionext.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Shorten the code. It still works in the same way. Signed-off-by: Masahiro Yamada --- drivers/video/logo/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 16f60c1e1766..7d672d40bf01 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -22,20 +22,15 @@ pnmtologo := scripts/pnmtologo # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo = LOGO $@ - cmd_logo = $(pnmtologo) \ - -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ - -n $(notdir $(basename $<)) -o $@ $< + cmd_logo = $(pnmtologo) -t $(lastword $(subst _, ,$*)) -n $* -o $@ $< -$(obj)/%_mono.c: $(src)/%_mono.pbm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.pbm $(pnmtologo) FORCE $(call if_changed,logo) -$(obj)/%_vga16.c: $(src)/%_vga16.ppm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.ppm $(pnmtologo) FORCE $(call if_changed,logo) -$(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE - $(call if_changed,logo) - -$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.pgm $(pnmtologo) FORCE $(call if_changed,logo) # generated C files From patchwork Wed Aug 21 03:55:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1E9B14F7 for ; Wed, 21 Aug 2019 03:59:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B826D22CF7 for ; Wed, 21 Aug 2019 03:59:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="d0hkI4ZV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726948AbfHUD7Z (ORCPT ); Tue, 20 Aug 2019 23:59:25 -0400 Received: from condef-02.nifty.com ([202.248.20.67]:60560 "EHLO condef-02.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbfHUD7Y (ORCPT ); Tue, 20 Aug 2019 23:59:24 -0400 Received: from conuserg-07.nifty.com ([10.126.8.70])by condef-02.nifty.com with ESMTP id x7L3tseI030844 for ; Wed, 21 Aug 2019 12:55:54 +0900 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L3tQp5016439; Wed, 21 Aug 2019 12:55:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L3tQp5016439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566359730; bh=MnhKYcrz1ZD1zZa0FQ/c4pPVdWC1IqleRXHvTqLaiVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d0hkI4ZVlWSQhA/kTYjAskk14fPWedG83kSrOlAXCBiuI8K3IFtSSzNbsi1T2Hxr4 L04gF3acSarHsw3tdC42LSOhYcbzhuzSgMRFGrt/3zcOL5mtbH8x0hlsiGoL+sZ4sr 0rpIDFni5/Hq8Q05VU5d5hdNnuvKXrGm0jFzxv4tvc15BpKZQw5BpTCUM7rpbNapGv jqfAfQJ7/zj29cxu/I8xaQSB+PgqEaVFlh18jpJP9HVoqzpGdqt3Kk5CE8ZOw95P+b jHbyOf7glfz/UycS8RpD1z99pWzxoWQcaDIibheQl0BP3a0nkjFG/Y8zbbXFnxJ3TF cQ0nI+S/tbbOw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Geert Uytterhoeven , Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] video/logo: move pnmtologo tool to drivers/video/logo/ from scripts/ Date: Wed, 21 Aug 2019 12:55:16 +0900 Message-Id: <20190821035517.21671-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821035517.21671-1-yamada.masahiro@socionext.com> References: <20190821035517.21671-1-yamada.masahiro@socionext.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org This tool is only used by drivers/video/logo/Makefile. No reason to keep it in scripts/. Signed-off-by: Masahiro Yamada --- drivers/video/logo/.gitignore | 1 + drivers/video/logo/Makefile | 10 +++++----- {scripts => drivers/video/logo}/pnmtologo.c | 0 scripts/.gitignore | 1 - scripts/Makefile | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) rename {scripts => drivers/video/logo}/pnmtologo.c (100%) diff --git a/drivers/video/logo/.gitignore b/drivers/video/logo/.gitignore index e48355f538fa..9dda1b26b2e4 100644 --- a/drivers/video/logo/.gitignore +++ b/drivers/video/logo/.gitignore @@ -5,3 +5,4 @@ *_vga16.c *_clut224.c *_gray256.c +pnmtologo diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index 7d672d40bf01..bcda657493a4 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -18,19 +18,19 @@ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o # How to generate logo's -pnmtologo := scripts/pnmtologo +hostprogs-y := pnmtologo # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo = LOGO $@ - cmd_logo = $(pnmtologo) -t $(lastword $(subst _, ,$*)) -n $* -o $@ $< + cmd_logo = $(obj)/pnmtologo -t $(lastword $(subst _, ,$*)) -n $* -o $@ $< -$(obj)/%.c: $(src)/%.pbm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.pbm $(obj)/pnmtologo FORCE $(call if_changed,logo) -$(obj)/%.c: $(src)/%.ppm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.ppm $(obj)/pnmtologo FORCE $(call if_changed,logo) -$(obj)/%.c: $(src)/%.pgm $(pnmtologo) FORCE +$(obj)/%.c: $(src)/%.pgm $(obj)/pnmtologo FORCE $(call if_changed,logo) # generated C files diff --git a/scripts/pnmtologo.c b/drivers/video/logo/pnmtologo.c similarity index 100% rename from scripts/pnmtologo.c rename to drivers/video/logo/pnmtologo.c diff --git a/scripts/.gitignore b/scripts/.gitignore index 17f8cef88fa8..4aa1806c59c2 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -4,7 +4,6 @@ bin2c conmakehash kallsyms -pnmtologo unifdef recordmcount sortextable diff --git a/scripts/Makefile b/scripts/Makefile index 16bcb8087899..709df809f892 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -4,7 +4,6 @@ # the kernel for the build process. # --------------------------------------------------------------------------- # kallsyms: Find all symbols in vmlinux -# pnmttologo: Convert pnm files to logo files # conmakehash: Create chartable # conmakehash: Create arrays for initializing the kernel console tables @@ -12,7 +11,6 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms -hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable