Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp7207731ybi; Thu, 1 Aug 2019 04:54:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrs7mcXfMH6dB2wWIQJJ9eR1U371g3kBmaTxWJExoSKuAp86KESZxmpRQ3dQBjaKqfCSbu X-Received: by 2002:a62:28b:: with SMTP id 133mr52671210pfc.251.1564660443807; Thu, 01 Aug 2019 04:54:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564660443; cv=none; d=google.com; s=arc-20160816; b=pPB7BJTCgrzQbtfnuC6enGt3qurFQhRbqgnwpbCBMJb0AyuVZO6QnomUZG0A7Or2kv j6EzlwqtaOa54De06U0OrwJ0mlF88fhgL4Y5uAzUbmLe1SpqSVE0PLHr6yOT4jKQr6q+ Cw7cb9WIG/KPfZypuicaBlS2E2d9WcEiSaxztZBJEJeEXKSddd5slcH+77yPKzDiJPMa Rx8dW//gG17fe4NO5akP8gdpmnO2eWSuH7ztBtaCsqE9MbsLAtc8wPlf2BytSp2RHcM7 qamTikHBtCqfEGORQ+rvg71cO1HwRWcomYOg7I+T/hltgaA+EYzbc+3LWTgpOsP17jWH qntA== 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; bh=PgU+aYZLiDJLRsV/Bv+x9kdPlaQ7dl7O6tN5UNZrVUg=; b=EPn8aE/Ru0lMGwolI3QtUgUACcoXkx019J8NcHA949ibeIHqVuRMi0heSmBdrP+iiX IaH8ap2OX2O3tglWaOuObc9c7oO90I4uEzbbIqLtI9uXOCrk/RHU97YXzZyW9KONcL9W sBj1ZJvLbBp5AD6yVfTa5JUSFgj/nKQ5mjGLst+CxCjjG0M0sTKyMolTBzHHbziT6+Yr OhWvrJg0D/2LTMnWf3Ee6D8eqpWiOYml2dvhTvqBVasdhnQ+YWYjD7S7W0FNDKPVEXLS GnmJ5PozLATdESXZqSrkAKIGrs7ERrfmtWm+IWpYY14S67YTdKX7HItfOdYsJeCWOKO6 hD5w== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d12si33974024pla.121.2019.08.01.04.53.47; Thu, 01 Aug 2019 04:54:03 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731269AbfHALxH (ORCPT + 99 others); Thu, 1 Aug 2019 07:53:07 -0400 Received: from inva020.nxp.com ([92.121.34.13]:53382 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730826AbfHALw5 (ORCPT ); Thu, 1 Aug 2019 07:52:57 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 7E3FD1A02A9; Thu, 1 Aug 2019 13:52:55 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 715C61A01FC; Thu, 1 Aug 2019 13:52:55 +0200 (CEST) Received: from fsr-ub1664-016.ea.freescale.net (fsr-ub1664-016.ea.freescale.net [10.171.71.216]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 0C39C205E3; Thu, 1 Aug 2019 13:52:55 +0200 (CEST) From: Claudiu Manoil To: "David S . Miller" Cc: andrew@lunn.ch, Rob Herring , Li Yang , alexandru.marginean@nxp.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v5 2/5] enetc: Clean up makefile Date: Thu, 1 Aug 2019 14:52:50 +0300 Message-Id: <1564660373-4607-3-git-send-email-claudiu.manoil@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564660373-4607-1-git-send-email-claudiu.manoil@nxp.com> References: <1564660373-4607-1-git-send-email-claudiu.manoil@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clean up overcomplicated makefile to make it more maintainable. Basically, there's a set of common objects shared between the PF and VF driver modules. This can be implemented in a simpler way, without conditionals, less repetition, allowing also for easier updates in the future. Signed-off-by: Claudiu Manoil --- v5 - added this patch drivers/net/ethernet/freescale/enetc/Makefile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/Makefile b/drivers/net/ethernet/freescale/enetc/Makefile index 7139e414dccf..164453a5dc1d 100644 --- a/drivers/net/ethernet/freescale/enetc/Makefile +++ b/drivers/net/ethernet/freescale/enetc/Makefile @@ -1,19 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 + +common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o + obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o -fsl-enetc-$(CONFIG_FSL_ENETC) += enetc.o enetc_cbdr.o enetc_ethtool.o \ - enetc_mdio.o +fsl-enetc-y := enetc_pf.o enetc_mdio.o $(common-objs) fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o -fsl-enetc-objs := enetc_pf.o $(fsl-enetc-y) obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o - -ifeq ($(CONFIG_FSL_ENETC)$(CONFIG_FSL_ENETC_VF), yy) -fsl-enetc-vf-objs := enetc_vf.o -else -fsl-enetc-vf-$(CONFIG_FSL_ENETC_VF) += enetc.o enetc_cbdr.o \ - enetc_ethtool.o -fsl-enetc-vf-objs := enetc_vf.o $(fsl-enetc-vf-y) -endif +fsl-enetc-vf-y := enetc_vf.o $(common-objs) obj-$(CONFIG_FSL_ENETC_PTP_CLOCK) += fsl-enetc-ptp.o -fsl-enetc-ptp-$(CONFIG_FSL_ENETC_PTP_CLOCK) += enetc_ptp.o +fsl-enetc-ptp-y := enetc_ptp.o -- 2.17.1