From patchwork Mon Mar 19 11:26:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132031 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606809ljb; Mon, 19 Mar 2018 04:27:29 -0700 (PDT) X-Google-Smtp-Source: AG47ELva9FRiJnmjRK/KaIOZsCq1VtGRb1qSmNHKn+mcAq+oOzNHETgZh8kNEdGcB2weVoUSFzk5 X-Received: by 2002:a17:902:b43:: with SMTP id 61-v6mr12002058plq.270.1521458849803; Mon, 19 Mar 2018 04:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458849; cv=none; d=google.com; s=arc-20160816; b=dDu+60uMqTx7X8Dupy9Mv5jeLkbF5eGjwnQHzfjOohrmX1sT6+rUcz6mFBqX5y+iUp wgI9fw1qC23h01X4BU9jbojrOLyZgN/v0ZcQv2dqSQNSkEqqci0eeiYJyZJrnBV25aNV epulWnGvaXHWb8ygn5c8+nOy/rIxq4WNp5scDiFXOA+Jz155D2fnK7Y2MUPhL2rRwo1z +zGzjrdhTZyoZtL8nZnNFUwfcthZ6cVvUfauRe7LINoIonFltN6bDJMNzLcOw7tBCDUb bHEy47wfMnQRaPamvnXt5snzQNIMSebs5vHBdcAwRJrJPDsJJ+bI/kmZKNJXH5vsIRCl UZGw== 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 :arc-authentication-results; bh=YQW8ekSTsqWvwWt5z9R6wXhlqJsVcRF3FWGa4fpNixY=; b=BwOEnYhQYV4et3d4CAbcSs4QuMEQbxXLbPm+GqcqO5Sfxp1OKrFQGH29RA/p7EtY04 lxI8RlTe3re0/9CXdjS0xul6hWrEUFstLMfeGy6dSMcNqWDNqaaFqvouZIpzujGLlEJl TKSfjMCmUq+1MbWkZNuxGdJyknXH60w0zPLdlH4Yt/+iIgnzx7Yp2axVPfdfSwMD0I8I VD5fOPNi4ld6FApy6SWDhHs8LWDUYxhzACJ3Me7sZ/oFGg6ygadq9ghV/xRdax0IU65g 8OcWtHN0uhzeBI9ln7eAegtFVjXV9v7rGpS65oFN1po2OYgqVE+0TskV5CcXqf7oSGBG cXrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UXyKK47U; 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 q9-v6si4916908pli.448.2018.03.19.04.27.29; Mon, 19 Mar 2018 04:27:29 -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=UXyKK47U; 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 S933259AbeCSL10 (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:26 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30214 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299AbeCSL1Q (ORCPT ); Mon, 19 Mar 2018 07:27:16 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQs023258; Mon, 19 Mar 2018 20:26:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQs023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458781; bh=YQW8ekSTsqWvwWt5z9R6wXhlqJsVcRF3FWGa4fpNixY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UXyKK47UWH/7gYOg77Z5SsfzpEifNQmFm7CT/P2XtJWBwA/h7U2pIJUZr1Yx81q8a ciheiD9MR2QRBBtoHbbFqmEpp24rx3+rnjBAhSeXUwUuqAFwTFl8D25Jqj04O4GypF Lcpe0zkgN5pJcNXLqujnhJ7T7kkzrF1I463yRysOJzFM/6jsDUFAXhz7chP+1UTsdz gMd2CuMzbNhN72Vi3zkMk/CFRKE+YzNZRcRTiD6uEXSnV+/yeK2S4ReiXIbdYuo1s2 qrOJzC7fi8RDpQAtRhy3osWVM0HH5iZLhbeBQJmpvytlu0XeCOE3uS/Z7p8Zv3q2VV FajHjzuwqECYw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 4/7] net: liquidio: clean up Makefile for simpler composite object handling Date: Mon, 19 Mar 2018 20:26:10 +0900 Message-Id: <1521458773-14224-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now, Kbuild nicely handles composite objects to avoid multiple definition. Makefiles can simply add the same objects multiple times across composite objects. Signed-off-by: Masahiro Yamada --- The is clean-up from build system point of view. I will apply this for the Kbuild tree. drivers/net/ethernet/cavium/liquidio/Makefile | 51 +++++++++------------------ 1 file changed, 16 insertions(+), 35 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile index e3fc464..bc99375 100644 --- a/drivers/net/ethernet/cavium/liquidio/Makefile +++ b/drivers/net/ethernet/cavium/liquidio/Makefile @@ -2,42 +2,23 @@ # # Cavium Liquidio ethernet device driver # -obj-$(CONFIG_LIQUIDIO) += liquidio.o -liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \ - lio_core.o \ - request_manager.o \ - response_manager.o \ - octeon_device.o \ - cn66xx_device.o \ - cn68xx_device.o \ - cn23xx_pf_device.o \ - cn23xx_vf_device.o \ - octeon_mailbox.o \ - octeon_mem_ops.o \ - octeon_droq.o \ - octeon_nic.o +common-objs := lio_ethtool.o \ + lio_core.o \ + request_manager.o \ + response_manager.o \ + octeon_device.o \ + cn66xx_device.o \ + cn68xx_device.o \ + cn23xx_pf_device.o \ + cn23xx_vf_device.o \ + octeon_mailbox.o \ + octeon_mem_ops.o \ + octeon_droq.o \ + octeon_nic.o -liquidio-objs := lio_main.o octeon_console.o lio_vf_rep.o $(liquidio-y) +obj-$(CONFIG_LIQUIDIO) += liquidio.o +liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o $(common-objs) obj-$(CONFIG_LIQUIDIO_VF) += liquidio_vf.o - -ifeq ($(CONFIG_LIQUIDIO)$(CONFIG_LIQUIDIO_VF), yy) - liquidio_vf-objs := lio_vf_main.o -else -liquidio_vf-$(CONFIG_LIQUIDIO_VF) += lio_ethtool.o \ - lio_core.o \ - request_manager.o \ - response_manager.o \ - octeon_device.o \ - cn66xx_device.o \ - cn68xx_device.o \ - cn23xx_pf_device.o \ - cn23xx_vf_device.o \ - octeon_mailbox.o \ - octeon_mem_ops.o \ - octeon_droq.o \ - octeon_nic.o - -liquidio_vf-objs := lio_vf_main.o $(liquidio_vf-y) -endif +liquidio_vf-y := lio_vf_main.o $(common-objs)