From patchwork Fri Jan 25 03:49: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: 156520 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp43576jaa; Thu, 24 Jan 2019 19:50:44 -0800 (PST) X-Google-Smtp-Source: ALg8bN6kFrzpMATK/lYks06K1Y3YCsUSJoPu02eVE47kjnpzU6WpI9cGnb31bvbgRoAvCu8vha0x X-Received: by 2002:a62:c42:: with SMTP id u63mr9145492pfi.73.1548388244435; Thu, 24 Jan 2019 19:50:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548388244; cv=none; d=google.com; s=arc-20160816; b=rDpAQ8E5FIplDDpiCZrtAdApViBCoNOPOe2IJUJ5rmD+XkqTyVvM9YCKsXGZI5lpM7 l4x+QanRf4Cje6QU7pOrpBxf6pZ28sW+88GOZGfaGSvH9d1vUqyspbtU3J+lZ1f5gP1V I9kcymnNASTuJtoIKhfH0M/XaIxbZ3Qy0GAwx9Vj9JOuQZSOlqkidnViSc5enXPNRgpd y/Ye/w4sODGeYs1Y6xx+sKvXDbnRAYreXPNL9v6xaLg6zpzivl+wReiDypn3DMPtdi5U 7pLCfO0NbvBJv90p1KoCS5wUtX/ik+uV/z5n7VhJvoBuveLZXmkKSE5fkiHdMMuHGAQe LW0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=7Hvixn4R6rXU1nhVDqmVbi8Imwg4x0RJAUaKJwgwJEs=; b=epF2tuJENV9sm6nIh0HhFijz5IoW70XZiHmvwWk/S5XA+QP0qgd7klqCrUvu2KNNLw 6ysdaMb+0Dwhvu7eXBvzEgipluPw1Np1iO93BCDzA/MEfG40WTlQpLx6h95NtQd2y/9o 2iwolCxfVRXIPQEuquaFW5Nhoiu0QSQQPAR5/rmSm5JdEdeKm7ZGVLjBF8d8FXl/b+uu e/4sQ0xLHW6HfmciTF5S2lQ2BJ6kfDcsa6opZM9CFSyFEJ5uAFqAcq3HBWRgeeZjwkJl gAX1lGdT5VwX/o2ty9+cGHXxaGhLhuvC4HjtqVJk0+V2oxcrjbQXOgFPPlcnOlutlrrx OaYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=xUMLAesL; 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 s123si24569236pfb.274.2019.01.24.19.50.44; Thu, 24 Jan 2019 19:50:44 -0800 (PST) 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=xUMLAesL; 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 S1728970AbfAYDum (ORCPT + 31 others); Thu, 24 Jan 2019 22:50:42 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:38003 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728473AbfAYDul (ORCPT ); Thu, 24 Jan 2019 22:50:41 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x0P3nm2q008098; Fri, 25 Jan 2019 12:49:49 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x0P3nm2q008098 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1548388189; bh=7Hvixn4R6rXU1nhVDqmVbi8Imwg4x0RJAUaKJwgwJEs=; h=From:To:Cc:Subject:Date:From; b=xUMLAesLK22fVkWqMXs3F/P+iQ7O4JKqLYu1RUPyGV9Ub8lAzLreNGzWgU8a/yvLe phyFQIgFE3t8xDiDKWCXbgYWe/UO+SIu7Z+pKBu2zyUK8Jpmgrxv/T3RJfloF0UQs6 ad4SGtqsd5fchOz9SxYj4H3pO/UGDARbxKdFdvfhxOKJICdVVJxVdsCd1FyxLvHmfG KlhH2MbCmKx9OQs2xpYJMayBD8jbM6Ol7awFOSKgCAmBI5I8shj87wytLiNlt1NfWb d16gBEUlLN0LDgQPe6BSCRH3vOx5yTl0X2iWAMSw75vl0J9cS8mcT1TU2NCo5shMu3 auPpdqQzdP0XQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Herbert Xu , linux-crypto@vger.kernel.org Cc: Masahiro Yamada , Harsh Jain , "David S. Miller" , linux-kernel@vger.kernel.org, qat-linux@intel.com, Giovanni Cabiddu Subject: [PATCH] crypto: prefix header search paths with $(srctree)/ Date: Fri, 25 Jan 2019 12:49:36 +0900 Message-Id: <1548388176-11325-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada --- drivers/crypto/chelsio/Makefile | 2 +- drivers/crypto/chelsio/chtls/Makefile | 3 ++- drivers/crypto/qat/qat_c3xxx/Makefile | 2 +- drivers/crypto/qat/qat_c3xxxvf/Makefile | 2 +- drivers/crypto/qat/qat_c62x/Makefile | 2 +- drivers/crypto/qat/qat_c62xvf/Makefile | 2 +- drivers/crypto/qat/qat_dh895xcc/Makefile | 2 +- drivers/crypto/qat/qat_dh895xccvf/Makefile | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/drivers/crypto/chelsio/Makefile b/drivers/crypto/chelsio/Makefile index 639e571..b7bd980 100644 --- a/drivers/crypto/chelsio/Makefile +++ b/drivers/crypto/chelsio/Makefile @@ -1,4 +1,4 @@ -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chcr.o chcr-objs := chcr_core.o chcr_algo.o diff --git a/drivers/crypto/chelsio/chtls/Makefile b/drivers/crypto/chelsio/chtls/Makefile index df13795..b958f1b 100644 --- a/drivers/crypto/chelsio/chtls/Makefile +++ b/drivers/crypto/chelsio/chtls/Makefile @@ -1,4 +1,5 @@ -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4 -Idrivers/crypto/chelsio/ +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 \ + -I $(srctree)/drivers/crypto/chelsio obj-$(CONFIG_CRYPTO_DEV_CHELSIO_TLS) += chtls.o chtls-objs := chtls_main.o chtls_cm.o chtls_io.o chtls_hw.o diff --git a/drivers/crypto/qat/qat_c3xxx/Makefile b/drivers/crypto/qat/qat_c3xxx/Makefile index 8f5fd48..822b5de 100644 --- a/drivers/crypto/qat/qat_c3xxx/Makefile +++ b/drivers/crypto/qat/qat_c3xxx/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXX) += qat_c3xxx.o qat_c3xxx-objs := adf_drv.o adf_c3xxx_hw_data.o diff --git a/drivers/crypto/qat/qat_c3xxxvf/Makefile b/drivers/crypto/qat/qat_c3xxxvf/Makefile index 16d178e..8f56d27 100644 --- a/drivers/crypto/qat/qat_c3xxxvf/Makefile +++ b/drivers/crypto/qat/qat_c3xxxvf/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXXVF) += qat_c3xxxvf.o qat_c3xxxvf-objs := adf_drv.o adf_c3xxxvf_hw_data.o diff --git a/drivers/crypto/qat/qat_c62x/Makefile b/drivers/crypto/qat/qat_c62x/Makefile index bd75ace..6dcd404 100644 --- a/drivers/crypto/qat/qat_c62x/Makefile +++ b/drivers/crypto/qat/qat_c62x/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C62X) += qat_c62x.o qat_c62x-objs := adf_drv.o adf_c62x_hw_data.o diff --git a/drivers/crypto/qat/qat_c62xvf/Makefile b/drivers/crypto/qat/qat_c62xvf/Makefile index ecd708c..1e5d51d 100644 --- a/drivers/crypto/qat/qat_c62xvf/Makefile +++ b/drivers/crypto/qat/qat_c62xvf/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_C62XVF) += qat_c62xvf.o qat_c62xvf-objs := adf_drv.o adf_c62xvf_hw_data.o diff --git a/drivers/crypto/qat/qat_dh895xcc/Makefile b/drivers/crypto/qat/qat_dh895xcc/Makefile index 180a00e..0fc06b1 100644 --- a/drivers/crypto/qat/qat_dh895xcc/Makefile +++ b/drivers/crypto/qat/qat_dh895xcc/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) += qat_dh895xcc.o qat_dh895xcc-objs := adf_drv.o adf_dh895xcc_hw_data.o diff --git a/drivers/crypto/qat/qat_dh895xccvf/Makefile b/drivers/crypto/qat/qat_dh895xccvf/Makefile index 5c3ccf8..9ce906a 100644 --- a/drivers/crypto/qat/qat_dh895xccvf/Makefile +++ b/drivers/crypto/qat/qat_dh895xccvf/Makefile @@ -1,3 +1,3 @@ -ccflags-y := -I$(src)/../qat_common +ccflags-y := -I $(srctree)/$(src)/../qat_common obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCCVF) += qat_dh895xccvf.o qat_dh895xccvf-objs := adf_drv.o adf_dh895xccvf_hw_data.o