From patchwork Thu Aug 17 11:32:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 802533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="Veff3fxy"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xY3xM1fgRz9sRV; Thu, 17 Aug 2017 21:33:11 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1diJ2x-0008JM-V9; Thu, 17 Aug 2017 11:33:08 +0000 Received: from mail-wr0-f173.google.com ([209.85.128.173]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1diJ2b-00089j-Mp for kernel-team@lists.ubuntu.com; Thu, 17 Aug 2017 11:32:45 +0000 Received: by mail-wr0-f173.google.com with SMTP id y96so37786319wrc.1 for ; Thu, 17 Aug 2017 04:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HCMOyrTbUEPfa8Y32VSz6TmXKYfwy98g/UewGqWfLJU=; b=Veff3fxyZrC+f2Jdvadly2DC39t245A8zUPsp4i5W6kRTGbs/IdeYWzcPzbV2ozltS GfYJogwxbo2msEq0BolD+wuIbuT9/YcyQn30uA6WGL/v3D5Wpc/Hy2m/BQ+gDeHnUBQI g+SozaUQiqXgFE2hqBDt50b8XZRaePyTfzCCQJ3ZR23EAGfaJkMoTgnwBqb0CA6irwWI F3q/NrUIpdGSkFlGGqjhTW0HqYkhGtF6uViXXNUNg1ZOG0nViL1hIK+Z63UqvclmXMth Z0UEh1y2nlicevCWpX6vr2DRqsgxk/pTU75N6VLOK79B+aiuclTZJfOCORpB/cNkC3qG CYsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HCMOyrTbUEPfa8Y32VSz6TmXKYfwy98g/UewGqWfLJU=; b=ETrv/St3jsmIvi6Awm2wKr5uOnWIbyM/Mnhw51zMn0DWrltKYNr9t5AP1g29TrLPHU jTE+Otg1okGXD6e9q2sNnXjKOpj7YWr02vx1/veXMbvVNZIWeNpQE102oNnFgNXvB8G5 p4h4mZIEPccCZ1KsK9mWtwiJLa+LH5kFora5Ozgwo7fTBkaCryOyKk+MUdL52KJ9hNlA j/MJRG6vWCrS6QlD5l3LKVuWyeniE4zK7MIHQxXB7V1lPVHPEkqh7l5dbtCh+kwukVRG ErqODQTua6E4Yi5cmzioj/6COUr7NzLPjZZA+De5sYBjJFRxlKcbHP/qe49TiAb7/EII y6rQ== X-Gm-Message-State: AHYfb5jQ7DHc3zU3sfzSdm8DTZheKTpm88/TpMGBxkdW6u43hTMADSPq 4lAUOiE4mKgmGZYncSU= X-Received: by 10.80.176.68 with SMTP id i62mr1596067edd.147.1502969564985; Thu, 17 Aug 2017 04:32:44 -0700 (PDT) Received: from localhost.localdomain (adsl-84-227-115-101.adslplus.ch. [84.227.115.101]) by smtp.gmail.com with ESMTPSA id u10sm1681576eda.93.2017.08.17.04.32.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 04:32:44 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [xenial v2 4/7] UBUNTU: SAUCE: bnxt_en_bpo: Move config settings to Kconfig Date: Thu, 17 Aug 2017 13:32:29 +0200 Message-Id: <20170817113232.28399-5-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170817113232.28399-1-juerg.haefliger@canonical.com> References: <20170817062457.7379-1-juerg.haefliger@canonical.com> <20170817113232.28399-1-juerg.haefliger@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1711056 Move the CONFIG_BNXT settings from the driver's Makefile to a dedicated Kconfig file. Signed-off-by: Juerg Haefliger --- ubuntu/bnxt/Kconfig | 29 +++++++++++++++++++++++++++++ ubuntu/bnxt/Makefile | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 ubuntu/bnxt/Kconfig diff --git a/ubuntu/bnxt/Kconfig b/ubuntu/bnxt/Kconfig new file mode 100644 index 000000000000..7dd42953e9f8 --- /dev/null +++ b/ubuntu/bnxt/Kconfig @@ -0,0 +1,29 @@ +config BNXT + tristate "Broadcom NetXtreme-C/E support" + depends on PCI + depends on VXLAN || VXLAN=n + select FW_LOADER + select LIBCRC32C + ---help--- + This driver supports Broadcom NetXtreme-C/E 10/25/40/50 gigabit + Ethernet cards. To compile this driver as a module, choose M here: + the module will be called bnxt_en. This is recommended. + +config BNXT_SRIOV + bool "Broadcom NetXtreme-C/E SR-IOV support" + depends on BNXT && PCI_IOV + default y + ---help--- + This configuration parameter enables Single Root Input Output + Virtualization support in the NetXtreme-C/E products. This + allows for virtual function acceleration in virtual environments. + +config BNXT_DCB + bool "Data Center Bridging (DCB) Support" + default n + depends on BNXT && DCB + ---help--- + Say Y here if you want to use Data Center Bridging (DCB) in the + driver. + + If unsure, say N. diff --git a/ubuntu/bnxt/Makefile b/ubuntu/bnxt/Makefile index 59cd730b2ee2..5a0883cb897d 100644 --- a/ubuntu/bnxt/Makefile +++ b/ubuntu/bnxt/Makefile @@ -403,9 +403,9 @@ ifneq ($(shell ls $(LINUXSRC)/include/$(UAPI)/linux/net_tstamp.h > /dev/null 2>& endif endif -EXTRA_CFLAGS += $(DISTRO_CFLAG) -DCHIMP_FW -DCONFIG_BNXT_SRIOV -DCONFIG_BNXT_DCB -DCONFIG_BNXT_FLASHDEV -DHSI_DBG_DISABLE -DCONFIG_BNXT_RE +EXTRA_CFLAGS += $(DISTRO_CFLAG) -DCHIMP_FW -DCONFIG_BNXT_FLASHDEV -DHSI_DBG_DISABLE -DCONFIG_BNXT_RE cflags-y += $(EXTRA_CFLAGS) -obj-m += bnxt_en.o +obj-$(CONFIG_BNXT) += bnxt_en.o bnxt_en-y := bnxt.o bnxt_ethtool.o bnxt_sriov.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o bnxt_ptp.o #decode_hsi.o