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: 171906 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp416884ily; Tue, 20 Aug 2019 20:56:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqwO0HJ8y4MuhjQOieTN9PrUVOMAd4etsihrCK2I6VWFpjSGyEFICTOK3S5/sS55Lv9Ysneo X-Received: by 2002:a65:500a:: with SMTP id f10mr27625574pgo.105.1566359771632; Tue, 20 Aug 2019 20:56:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566359771; cv=none; d=google.com; s=arc-20160816; b=m0fLdGzkHVZcPKKpZSvQpu2/Eef/knVxwFQC2rbb9N/+S0nAflhg99VnbQinSQE1lS ZAsPqb4pCo1dKWCYKTdZW48q/9H03eh3kTa+JmibUlTju8yy5DmHrCZu0YFKIVBiCNjH u/RulQhR6DSaxvf6Zyygmw09yBrkqXEjrL9y4aafo7jrNkhwVCCCxLtrr6i3WQNdiQD/ 0qBHibsGnLntC3QEvwKhQPmk38Ta098jmIr/Jc4+sGZ006zJQZnE8OeBBRzLQB6vRb2s euBtqbn/9UOSvhwJDyo5is4LUUnNWzYhfY2w9dxuWBQwHkZmIVyJ32hOXES9b8P555vU CKKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=vmQBAhaSJK2tNhLoMYDnGiXN0DBL3oiw2A5oHUe77Co=; b=vwS8Mn6owm74RNvxwh6b1dJ9iBOI7RYFLogfYxHa8jlUi7za60agBls0Fr5ewlNB0T ljVId4tnqRz7+lUsKlxzXe2VkH0orUSVS9tlTNkhb4Q9Go+OeEi1nswNMEX/wJI2JbkK yY/nvVNKHs4JIxwuqQ7h5tM04pZiVoz1NqeF5AnEEUB42hTFGVj7r/qWkDpwCNQNm0vT wM8REhHZwJa1xk6o77e6tC63gGJVnwbTng3CWGShHY2kfsFe/c2ccd4lka/PTBDAJbr5 2CxUfw10grMV3yTuheCi/lA84zJiNsRQqj3+lJdyTUzrWc25ekX2qPEWT91z9y2RtHcB xQsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BeqOvx+l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si10838005pgv.116.2019.08.20.20.56.11; Tue, 20 Aug 2019 20:56:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=BeqOvx+l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727446AbfHUD4K (ORCPT + 28 others); Tue, 20 Aug 2019 23:56:10 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:17940 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727294AbfHUDz4 (ORCPT ); Tue, 20 Aug 2019 23:55:56 -0400 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.17.1 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: 171904 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp416788ily; Tue, 20 Aug 2019 20:56:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwV0e2kgatepb0JxI7As9z/ypp4vpvshWYqmH30oEbK/Z3lTXspUR+XfOpgWpo6GNVy9tg6 X-Received: by 2002:a65:4b8b:: with SMTP id t11mr27448725pgq.130.1566359766033; Tue, 20 Aug 2019 20:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566359766; cv=none; d=google.com; s=arc-20160816; b=j1g0ovre/dSKcT0hi+v0JlhZVhuJWCStsOQGgfj1mAqxQs7n5E36LrtbzYaIcKQntX QT1RNWIQ96nZdvezZRTkfECp0NIJQOhrTH60cr22IE36K4gmHTCndIxmTfwS8U5c0uMg 385v88LWPE+Ldru2rV88yqM1ru7G6xkeY1Bl8vpXzK9ZtLfr4fsgRCwR2MZEmRxmJMIc SRynHiaDVxsB77Eu2Yw0p4im2iIFOPjkAc5ijOHnKPBJ7WL/qKtgZyrvbQnW0aBnwojV 8Rzozl2wRJ8UDFTtwKP1ccNoBwGBn0E/4+RTpkCgJsWWFb8j38KxTAie+U1HBanemZvK V/kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=xvzRaJpfAiuO+5/j+Hz3YB5Qx9ImeceBGGq+CyKuQ7k=; b=WcyefmyolumFChJ5wTy664PWlDAgGgN/fQn/dv7o4P5oGaCQ0Hz4jOIFv8oo/atzL2 Mqb8qPYCInrr+SDFzDAhrkyPgt5Q6j/ZYxqa8sYV77g0St7puvaTZudItKSFWeJkf9za 7DQnfslaKplRJgqtZJyHUydynLwOiwjPuvS/2/OfKP/9ZiOTGWPh48BzD4YALOmF+djD OCjEnLAj4mlGzlt9UUr8/CJudO+7u0HcxZA6x5M1kCl8MOle5YxQ1Vc9v4gVEtELmyAh /4QKuL2WgfnPjDTZw0YFyhJDKMwI4M/sedAI+z8NH0XsQxuhtDkgzVIyp2GdmFkOr8AO E6Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Wa3+nU5B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q38si13696877pgk.63.2019.08.20.20.56.05; Tue, 20 Aug 2019 20:56:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Wa3+nU5B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727359AbfHUDz4 (ORCPT + 28 others); Tue, 20 Aug 2019 23:55:56 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:17893 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbfHUDzy (ORCPT ); Tue, 20 Aug 2019 23:55:54 -0400 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.17.1 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: 171905 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp416807ily; Tue, 20 Aug 2019 20:56:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzp0eZZGkNepe9QXeWa5xWFmYN4f1M9pZlfMe2NuibbFsqKuu3DJCSmboNUUHCN/2LHgdUM X-Received: by 2002:a17:902:1107:: with SMTP id d7mr31208116pla.184.1566359767029; Tue, 20 Aug 2019 20:56:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566359767; cv=none; d=google.com; s=arc-20160816; b=gzXZCPU9Ec0YMFTJs+llaB8c1odV3gkpoCueFeul8D2BuoIWJ/enudJaExyGlDAAuB dRqDE2t4v017+J7/s9hrgABK8gLCrqqmxsE926ti3F6N0RnaCmf84ansCtw0tDkPzrn1 qWvlzECEGJldBdDJ6ZZUlg43zOaRGrLkfEwkDwOiCHZ9yPFF3pIrH4Fz280Hs0qNNenb RSI9dOxmxOxNp6mPsJwjYCjjyvYVNDXB921chOmZVul3TJk0HrTeiG6s7hPFIv6313iA RFPOvwizlGYwo9Fsfhk5O2Q17LQXgEPldvFE0Z94ZhKDwi8P9NkUzLzYr04Kx/SscOsm Dpxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=6fHkMxqT3+v0CE4zyYlxI6pTvIRPi8TKT8Z20L42FeY=; b=09CbfHkKzmgGPFkYi8TerJS95Cm/SaJNKA5zcoHrcorSnZGKTuvm4kCi6DOZm3iOAx mEw3I3V+dHKvH6dXOGwlO0yd3OTlQd9KdYFi5qEFIIhUWYLLqbQfV/79m4WAa2ybFdXh pFyKHEYVa9cwaPKVEHy8eNOtjjhLmaFX5R99UAZblDMNVJOKMOLcdiV3TWXE6UIRkaOJ FrkratCpyes/Ut8le38xLxkMjRrLZGVfloYlFF6745efpREbth56gteo0Ksbz0YwWpN/ U99FOgrInVVz4wUw58J7irsinJNW5kUB/kBXAjFwQhBmXZwEdwZOZTEMulx8Er1OoYL/ W9BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CGTM9Ip8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si10838005pgv.116.2019.08.20.20.56.06; Tue, 20 Aug 2019 20:56:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CGTM9Ip8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727438AbfHUD4F (ORCPT + 28 others); Tue, 20 Aug 2019 23:56:05 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:17936 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727286AbfHUDz4 (ORCPT ); Tue, 20 Aug 2019 23:55:56 -0400 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.17.1 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: 171903 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp416693ily; Tue, 20 Aug 2019 20:55:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPmBNilCikQ/F/7NTSv0kfObjQqtO8mc/56eFEsn+VeiI+CtiNXpBP1/JdNyyP4hXt6VhF X-Received: by 2002:a62:e515:: with SMTP id n21mr33980720pff.186.1566359759060; Tue, 20 Aug 2019 20:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566359759; cv=none; d=google.com; s=arc-20160816; b=Wn4iqgPYLEAQXLWMbHzFHlg6wZ18k6F5vfQAGxLy2JUvEHgLMNgO8DEz4NwNdvOqNQ XGG+mnAGRrb0LLmaJbksNWvMISdpgo9vg9rxBEPaPUKWKRfPz+t7ryCyG39f5n7hOpl0 H3bCyS8Q/j45P2lIU5Bb57EzWnKfSmTLgm8hVSRtkzciCvqHDbXl2S4CP4cYMpebBvSX 4cHOrb9CrRHS3oTyazyxY9sd1lkKP6qwQGPouNwGsXET+LHMq/mCOJ2D35IKRHyztCL4 w1u5JgaU94e9NXXMHn0GS1+F2UFgMTGxKtAhOwCfGXAKhOjHBB3TmLZyV/272jqwCuC/ S0fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=MnhKYcrz1ZD1zZa0FQ/c4pPVdWC1IqleRXHvTqLaiVQ=; b=cn1Jo+zwJ5M8NydITI+6GjnEDed5tBBBzYEtlH6wpbtRK2koDMPzcJ2gZTWa5jtMb4 vu2YiEmmNiI41bSOgn5m8WOYMw5UosKIr21yPgma2x0xVlTpUX7xBuTTBNfpdyYb9jjm 5lXy8PrscLQadthdh4ltipq5pj3q38OKLFFUB/K8i+oCtHKrLA6FjkZbHxkjLmrxtqHo naq+5+VzsE8pCLDEy3+4rSaQCYdeThvRJFrMnLEQquI1yWXELw/ny7w3VQSnUqdzrl/g jPFrEWC+ZX7UUPjwPLWMWxrkGGmqIuE1gzSMbSC75PStebc01/zSRJ3K4YdCDIvk5nMr 5taw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=d0hkI4ZV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f98si13660054plb.256.2019.08.20.20.55.58; Tue, 20 Aug 2019 20:55:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=d0hkI4ZV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727392AbfHUDz5 (ORCPT + 28 others); Tue, 20 Aug 2019 23:55:57 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:17887 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727253AbfHUDzy (ORCPT ); Tue, 20 Aug 2019 23:55:54 -0400 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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%) -- 2.17.1 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