From patchwork Wed Aug 21 04:12:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105431 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 75AB91805 for ; Wed, 21 Aug 2019 04:13:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 542AD206DF for ; Wed, 21 Aug 2019 04:13:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="LQcJcc1V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727461AbfHUENW (ORCPT ); Wed, 21 Aug 2019 00:13:22 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47119 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbfHUENV (ORCPT ); Wed, 21 Aug 2019 00:13:21 -0400 X-Greylist: delayed 1049 seconds by postgrey-1.27 at vger.kernel.org; Wed, 21 Aug 2019 00:13:20 EDT Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L4CeQB002060; Wed, 21 Aug 2019 13:12:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L4CeQB002060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566360761; bh=PNOVklVeViw/I1/MmLHYVbub09qIw/pFC2OWA5k3L1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LQcJcc1VfN83cd5Um0q55gMG3Nanz759avd9ucEZvv4/Jk69mJPLV24gsAMiZVxaz NwkLW+edKS75pYBcLYHaG9GJz4SFjknkDGM7UZtD2JAJy+FhJDJKMrUU/AH56sFjR0 wliRjaKPifyIn0ASBxmNNNNBZqGDmOpgmA7AlGKCKgPGm0snUF98OgxMsjqCP0GdW1 3fc5uknRB2/0wuVNWc3/qS7m+N8iOKI3rAzhCg+PVhjsZonuZHWv1/WChDLGB7VNfl kJLz++7E0V4DFxu7Fn6/hmk0LwyAkLbRziPZWZ4Ec881DCcHIfmbIn5BRDq2/mN62x rlRNLxxaTeYAA== 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 v2 1/4] video/logo: remove unneeded *.o pattern from clean-files Date: Wed, 21 Aug 2019 13:12:34 +0900 Message-Id: <20190821041237.23197-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821041237.23197-1-yamada.masahiro@socionext.com> References: <20190821041237.23197-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 --- Changes in v2: None 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 04:12:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105419 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 7D6E11813 for ; Wed, 21 Aug 2019 04:13:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5AAEF206DF for ; Wed, 21 Aug 2019 04:13:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="otT/vRdp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727359AbfHUENV (ORCPT ); Wed, 21 Aug 2019 00:13:21 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47118 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726224AbfHUENV (ORCPT ); Wed, 21 Aug 2019 00:13:21 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L4CeQC002060; Wed, 21 Aug 2019 13:12:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L4CeQC002060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566360762; bh=rG1uzD+ZsouFnScMd+YS+lbLIqKukipCyXFlBuBls/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=otT/vRdpFvNnROJNxtb+yU1E8OIA+ohk3ZhRjZVkvdwKeQK3pyBNLr257cnxw4aV9 BY5C3ijhHysdD8e1TMUJwFmlzkA3oV2Tl5bHUtGSQusH1VGiKzzjsIRP9+2T5teMNK iRvkAMXe6eY38W2otcXUIRKhHcq3Mt/8Et9sKxWb6gIM/FH0qTFIo8bXRs6oom2mAA 77iz3S6axA0pmj66S+0HDqul4F81OSvxXXymEbMlUJdAlzGzWrRVILuHMmtYpA+eLQ MN1GGOfFzrLdEa7pLkv0w7/xYT9H2Xua4SqWnoWrC9wymBHG2hth4SaTF9NtDHLq2y 8Kh4660PXf+Yw== 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 v2 2/4] video/logo: do not generate unneeded logo C files Date: Wed, 21 Aug 2019 13:12:35 +0900 Message-Id: <20190821041237.23197-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821041237.23197-1-yamada.masahiro@socionext.com> References: <20190821041237.23197-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 logo C files are generated irrespective of the 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. Files listed in 'targets' are cleaned, so clean-files is unneeded. Signed-off-by: Masahiro Yamada --- Changes in v2: - Fix commit log 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 04:12:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105421 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 355CE1805 for ; Wed, 21 Aug 2019 04:13:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A465206DF for ; Wed, 21 Aug 2019 04:13:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="OR1LHhnA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727503AbfHUENW (ORCPT ); Wed, 21 Aug 2019 00:13:22 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47122 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727249AbfHUENW (ORCPT ); Wed, 21 Aug 2019 00:13:22 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L4CeQD002060; Wed, 21 Aug 2019 13:12:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L4CeQD002060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566360763; bh=Ffstt/8PGJwwxtxBre1W6DSDJ2YVkbwk2UqRJAoaJEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OR1LHhnA+Er5vOgGTRCZgC6jIKc4dC9Cg8YnqwHrVxpuDe1cNnaqI+14NwtxYfVRM sXbQVJgkzv+jrrZWYk5cwFWdJnrFLYbiKlbcRVlGB4OU2sASwY/0aC4spw1ahBK3aB e5zW3Y8TYY/PBBBGydwMY5kGdhT0Ow/lQ3l7p/+x80OGDAFNPMkssOAb2O35zeG7f8 WacOTdhvNMquR4qzPDRi5Nu6/9ZR3MnMC7lp1gjAm5EWlTpFRdf+81xf9jVNMwFt/5 GsFcVcsNDNWllRzXFsknLgQPhPatzS5EOUyKz3XDlw3QX1EAq7vPFn5/VLv48xHoM+ xD48ux/rBy3kQ== 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 v2 3/4] video/logo: simplify cmd_logo Date: Wed, 21 Aug 2019 13:12:36 +0900 Message-Id: <20190821041237.23197-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821041237.23197-1-yamada.masahiro@socionext.com> References: <20190821041237.23197-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 --- Changes in v2: None 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 04:12:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11105425 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 3D83A1805 for ; Wed, 21 Aug 2019 04:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C0AB22DD3 for ; Wed, 21 Aug 2019 04:13:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com header.b="yWW1+L8I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727516AbfHUENZ (ORCPT ); Wed, 21 Aug 2019 00:13:25 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:47151 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727345AbfHUENY (ORCPT ); Wed, 21 Aug 2019 00:13:24 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x7L4CeQE002060; Wed, 21 Aug 2019 13:12:43 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x7L4CeQE002060 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566360764; bh=06l9SB7v5ILNMn5J9bc9p5rJeGZsTfbhbNdQ8XoOG0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yWW1+L8I1XCIs628NU6dXbN1JpXVgGa9lCVYdjp/ScCfzZQSUxPV0PwRnETmrqy/y BByYlO59aDg0VprgA2PGszaeFB58MGpOeyIt6qeiSNz8wWeIaNtwR9bm4NotQe5T8a VXsus2w8/O/cqkMWzXWxe7g7nC+JR9AD7Lq9Gt1R8c4gJ2E+ekNKEzc3/IWtsnOkEs 0F4qBsvJ5hQTI81EQ/uwCDzwidqFahybRK+sQfLkS/XT4QZ5rGlsux+0sLhbd8C03Q G6doNGfHAlto9L9vULFcwFjle5XABXdhtM+V2/NEUA8nyoiH/T7BdQtkePHOjLmhHO xtJg5XBwEqr7w== 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 v2 4/4] video/logo: move pnmtologo tool to drivers/video/logo/ from scripts/ Date: Wed, 21 Aug 2019 13:12:37 +0900 Message-Id: <20190821041237.23197-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821041237.23197-1-yamada.masahiro@socionext.com> References: <20190821041237.23197-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 --- Changes in v2: None 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