From patchwork Fri Feb 23 09:58:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129338 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp413341lja; Fri, 23 Feb 2018 01:59:52 -0800 (PST) X-Google-Smtp-Source: AG47ELuKRX/Taqz7ZuBK4DhKtog97AQ+gTh7f4Bx9GiVEcR5CPAg3WcPPx3PxBEZM5BIKeVli1lp X-Received: by 10.28.178.81 with SMTP id b78mr1095625wmf.78.1519379992648; Fri, 23 Feb 2018 01:59:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519379992; cv=none; d=google.com; s=arc-20160816; b=dLtS0c4Ked+swebxv0AfvU0zqxidJbIVCCSZtqOPV9hNe4bwudcsF4m+f53jzo7NMd XoNh3rTX+6fOdzlu9JcNg6LnfeGyfxB/ENvPkk2OhO7fq8lFNVZG1J0k9GjOfspQDEvw ExLTjhP1DLZC4Sqn0bkYwvRqvjZEld+a+PplCm0B4egBp0WPNY9UwzCN/HxBSaPvHfJk H+KUkbPC9R/vtS4obMK8PD/cqeUyn2M+8MrrCKrWyshyF+zVSAVTI5qnGP4tpuw+II73 HbG2EfJoapPLf1CRxboFl3uARFvLL2SbiwL54LwGMKzE6qVxlYlJBAKKXO1MypNL+wxK xoXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticoutput :mime-version:references:in-reply-to:message-id:date:cc:to:from :dkim-signature:arc-authentication-results; bh=SIEYWHgk91HR8HtBIF+pSYxQIqZv816DVQeO13HUy+Y=; b=0x34stYhwARGBAatERdL/DN2jCZs+XVuxK2Kpx6YvRUQBaNb0AfYx8l1iDUEHowcky az/Lx8I2grlXnTBNylwE1CqY1opmI1zaxRZm0Qg6ICwkm209nHZzEuA3N2HKodGJnEJh UN7B4nOLTYTdc1FaQ6Ns7RQHKSrnJHuhX9nZaTx7wyn95bEMJpjIDQcUZc1553CV3gu3 yHynJTL5d9vJ90oKOTLnEiJ1GUmyE2XaK4OnNJloGc+txr4KMBoWZcO4PuF5XiQceFwB wMh5uyhEuSiUf6tak1sQqAuzHiOCundqrdghNzW1keXgO/qv8n0EFTK/jw6a7iCg1/S2 I2/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=nzBQMFR4; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id c4si1652723wrd.540.2018.02.23.01.59.52; Fri, 23 Feb 2018 01:59:52 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=nzBQMFR4; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C00F34F9B; Fri, 23 Feb 2018 10:59:46 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01hn0234.outbound.protection.outlook.com [104.47.1.234]) by dpdk.org (Postfix) with ESMTP id 133984CBD; Fri, 23 Feb 2018 10:59:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SIEYWHgk91HR8HtBIF+pSYxQIqZv816DVQeO13HUy+Y=; b=nzBQMFR4+yD4reEtc/G0mLFgrk9uewhVIYhETAPaX/HDWj8Qn1UQTYYQ665bHOfGxxf3LirV6Gx46DTOf3A89P8C+505v/nUcQpdENtnxIDmPrtm3PJrvKgpRIkfdBD2+jJ6dtso1uZ7MJIyDt9mhG2vBWq7qEiha1i27SnbwIY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (192.88.169.1) by AM3PR04MB0758.eurprd04.prod.outlook.com (2a01:111:e400:883c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Fri, 23 Feb 2018 09:59:42 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: thomas@monjalon.net, mvarlese@suse.de, yskoh@mellanox.com, stable@dpdk.org Date: Fri, 23 Feb 2018 15:28:03 +0530 Message-Id: <1519379883-26287-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519379883-26287-1-git-send-email-hemant.agrawal@nxp.com> References: <20180222225308.16972-1-thomas@monjalon.net> <1519379883-26287-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.169.1] X-ClientProxiedBy: PN1PR01CA0100.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::16) To AM3PR04MB0758.eurprd04.prod.outlook.com (2a01:111:e400:883c::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ecfe03cd-a2dd-46fa-0b43-08d57aa42967 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM3PR04MB0758; X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB0758; 3:xybgwtb8hELMKz2bGWN9gltYlL2Py6Tc9NwUPh3+nxab64/J3CGoGw9L05LRdQ5/QbW4xKuZuIP3BTSVg9oH+ioHEFkdXw4orPdnYf50F0bWUO36gnwHLsxnOOfNp89uymUT2Y1E64oFxQtKaUUgW7cDJb0u5S/pPra0TkuX/YMjxGIwRaXvq/xnmCjk0FTyduHh0EW8FjVM9DcP0mdymn8Z84UXu7BdnhryBRMp+dUbWZ7oqJmNabRAhYLC1Ryg; 25:fbeQP3tUtqSwWKqnETa7uB2eh2CEHCRqZK27LeGGFrzwEY2LrNOKch/U/jrKZZdW8PQkey8dsAftidAy17sir1NTWgyQ8P49ZMZ3aN+SB6BdND1ItcLBuKQWDwwcJptD1VHzodmQX3PrQ9UgatoealhgGYe0JUklnIZzLTVeg5vAy2tihq8qk6/nLsGMlttQ9ThmnYn5C5Trmf90MgZcbhTXJ5fUW0w00Fi7AhuJy017W2BXcsEFxrjbFcKzM+EJBWyYzcs5m8uVn69volYDs/3zSzBhTxouDlINER8U3nC5Q1mpWLvLP1ebta0BGGG13W9irehdIbJ2/zbrDPpLBA==; 31:M4Wm5FOkNvmSNYbuE30x+cuJdpXOcHq7fqZ/BVvz7TG7wXanSb7Lu4951DHOkyMgCy2kSaVhIM7EtD78Ckj0NjKxtLHkznnnz6lS59dDWIi/lqQM+PJmQLDzkfQS4ZqFP97l6MAMB43Xhs0OgCkqjCXB/wdSFORRnNeFkS+VL1ruL4lw7lSh7kxegJJMTgswEY3kyY6T+Caz3ft5KJGe1hDizd/LYwVOfQRhf+3HQN0= X-MS-TrafficTypeDiagnostic: AM3PR04MB0758: X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB0758; 20:kbPbyZWDIlPRp0Nko9ENnTMW0iSjpr8XPsiEdFEmQY9f2iYo9pUyETZQo1GElcaZypq4/ROU6bejCtZ5zr43eERae7yr9XjLqwrY3wW/DVGZX0mr49D/VFVUlGNx5joVCWEp8+lzHpWUesKS0zjmD1Mc0+YqXM+rfao/2haHHQ2zW1DwoB/o2e0rapt70iY/P5kOjsXv2P60bGiqwzc4a0/JMYhm0Wtwy3vdS+sWzzb+FUyJwaUvsOBdkWi4Gg6TgXc0GePV4biAbGBbi0yRI/3W5astNKGmr5I9k6cDdXhhp7Gk5tGWNSWXAiTi9QsJ5d5H9QK+hv+Qe+PZyiZ3+1n6UBrs0WfKtH44JAH5PGs7rG3Qs/NTGiAEJRQETvrR/y0HqOpW2Z7LYT3rgFKeCbAUeLM74nVnWThCCCeG1Bc/gL0wuJZvcotAHEWBXa0rEC3v6Uc44in+rJ31ix7RIDd3YuecFW8/DkuZ1zKc3O3u6AnSMf/3p033R0CMMm5c; 4:6aVz62ogR1c2WrkmktaeBTzzZUGB/xE2nyfaJWE8CgRr0EWqM9NJbkhHFmg0p3LgbuX2VXx+Mc3tYT67cIg+FYrj8L2ozZ7zXENKwciU7nuImBFm7DgMgYuexaYw//I+gXoX4uiQV9Zt3WwneH0kgPUNm9cYrC3iVguWprWPfqCb6i9zjy/n+OEA8RfE4lx8QDaTxkSKvcnuM2kqufAqDDpIsKriz09YVi0z4mlaSfRZZ8VFoltQ/CiYVZ8abKPcJbsMiUrFVPzZ4VXiOexSLcVRGlynE2Ap5wDgYxMrS94tFvmh74mVU1PuNjoJbQ58jQ0Nz9Gls7vKaHNIR9+NmkbyuAruQDWu8ItS43kxXPY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(66839620246622); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(3231183)(2232076)(944501161)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:AM3PR04MB0758; BCL:0; PCL:0; RULEID:; SRVR:AM3PR04MB0758; X-Forefront-PRVS: 0592A9FDE6 X-Forefront-Antispam-Report: SFV:SPM; SFS:(10009020)(366004)(396003)(39860400002)(39380400002)(346002)(376002)(189003)(199004)(59450400001)(2351001)(47776003)(106356001)(2361001)(6116002)(8676002)(66066001)(4326008)(97736004)(86362001)(2906002)(16586007)(6666003)(36756003)(2950100002)(5660300001)(48376002)(478600001)(3846002)(186003)(16526019)(6916009)(25786009)(6506007)(316002)(81156014)(52116002)(51416003)(68736007)(386003)(8936002)(81166006)(26005)(105586002)(50466002)(76176011)(53936002)(6512007)(50226002)(305945005)(6486002)(7736002)(59010400001); DIR:OUT; SFP:1501; SCL:5; SRVR:AM3PR04MB0758; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR04MB0758; 23:Lilrnm0HWBfL5lzEx+2dlK87W4m50isSjQKnFQIUy?= btgVYWD6rEmws8lld+kzXm2Rs7QNm1plcDdGznfgGrd/2MzzZ2xC+l9REzueLDROcoMSxVMLydPiYtX0dUQ8NKooC612czr8KaelFsu7hsCekbOgCeuCAdHIlyBmb76onSkDEad/eI6v8Ks6GW07IxjEp5w1eOirQm1mLs5yBttNTkBAGkaAr0Rg3N4CCQcYw6OkuUcWQogAvkxbd78No1T3ToUVrQdsHDMfkJjjF4ghfqTAeybepMdWH7/sjyY1QW4RwTqnZqiGWxB7cfYi1u9qWy8jHgnGKfTVuI5jyQY6l5uHmmjmbx7CXz/DZoh9ImW2PBo8EvJliTOHOUex3wp2+Lyli48kiBwdIzA/ldNp3rY+O0kDxnNrHlopy4MBtk3npdFXVE3xwWgrUQ/6Mz6D/qSFiG0Fy+oYdr6KBTul9WMLEGgg6tJ2sFD+QJHdbk7IqlWUii7giaFW1cRX9DHOJdqSqshgb76u7UGXQuu3ISrTf/Rapdy62Dg0joRn2H/RVXdEmiRJzH3phKzEZYH6GzHAlXbzuNlRgvPqW/5kD2XLABwrnL3JxJ2N0E6Z/23YmLv3uu/MLLQ7EzfbphwdHW/1v5Gus4BBd7MWLtC4p6gmmU5/DQ/Hw6htB/zpHvtDW1EwEvOw0yWPJUsQy7KAZiUV2biPDIchQjPlm/xiOSdLpCl0kjBFq9ZN7yO5pDEb2Joj2r1nkwEIv/FQluF7KOAukHA9W5XVOGy5BwbS7moRcHcf8Yo9gARMBVVkfONjl2EAp4bnPIAqRKVkqqHkkpgMrtX8NKEDlvmrVVXzzaPGtAtz5cj2UoxbvjQYdA6HfTSBtqiOojy8kXoqskwzDmW2ei3la77AAqPoM2ekp813sgHxJuAGdwrE1USCSD+e0PBla47QpMfVAFwZ/w/Bh1DwRccjYFrBaAqYJ18DM7nKz9p5SO+y82T3Tt98hyPhSQ4ACSZPgGq+5eiQ4R4RV8jDVSPwjbsZbQExILnIoaupH4ykCcJAN5wICWTSum9NYZ6j9abN09z5ZS76jgZ0OpdnHh7EI/e7OP2akVKTCxMbVT0krzJ4Ya6apGDDqQGFHRpqvF7YLVurHwxRe0qfr9Nfl3kCoz576SUzVSz8EeK5nvgzrjlh3TCxvbGmEAf2tydQs8sm73O2r1SYFlQJQQ8mECPYLOcuSAxyfQq2A== X-Microsoft-Antispam-Message-Info: jxhC7WRvqJkr460mRufPIeYAEQY7WTtWpZFDogq5CDn6KWxAEB3hwVTFafEXSrpFSHxVhenz5KfabGulF0M9B/0II3OtDwGdFG8HrboIeebuRcvqdzFqp6JjLuvhVzNhkeHvCSdphdfwtwqmJU+f4u+/PyrBxuLQ9CIt3X5VFYI= X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB0758; 6:rWYAZNdUlPT8m3GcYeCQFZ4PX/X4vtanG1GM9UICfWGwfLGYnoPHJZMSc2XwPc7/cZFsPRLa7Wl2jrBfDbKAjSeF2C362S80EMJAmpSb01OUiArJrDtz8hgRFoloJbr3fEwbAiIxQkjfpwHNCJxUs3bgay8OYFG2cqGlpyBdXg5IU7Cn/zgDleNOud5eIf/2YOTscJmFSFML5sZRMOn76k2xymwbFypPjrs0zvj3KQSXwfgtHYbPs9RKCiunLud1bOgcrmkNzA5hz/mIo5+L22JOekQ94926qpKyubVUABiFek8YAYVfccfuGi4Y2/3xrLQqqS/+T6r8FVVzQIZxCb4JaOlD8ajfDtWHIQ/uWwI=; 5:eOhK/w7NFduuUCVtsZ2VCehlL5Qr6SjhUKH+mAISPA8pi8TQ0McXZqx0caUvv7UHObo8SUL5pFBv4ZjkU0qan3in2lMELehEX3/yUR2wMgjtj6nHwMII0OjdNNBOx1aZnMN4UMCnnYONHPTkkdtad5pxUtm7bAP08bpaeAaoCw8=; 24:IU7EYkWdFD77v7o5VK83RFFbQs8Q6XmKg8nwW5PY8uETja76zW4N58J26XPxcEanZ1pXCDnkoFNB8Xoe3XsLHg==; 7:GdjTt5gW1FSYPBtbSZkyr/pb+U8mC47EHyjknLoP7JFWmMiwrgk+Ou1sQrgS/20GvyWpl+D5IgAzYLKB/26QLbMaJyNrbdBd6fgT8/343I2VyhuavL1O9wEWlOQu8Oqdjygl181hIto+9MSil+HchsN60diESbDZbs7j937sszKt+z95xcj4MvFpTj6jRHQn2cI9R2aAmI3KEJUyMVJH6eTqrlk3JAc8jJS7gDUlvlpcFpuP5aTWXW1yB6k6tZ0Y SpamDiagnosticOutput: 1:22 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2018 09:59:42.0012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ecfe03cd-a2dd-46fa-0b43-08d57aa42967 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR04MB0758 Subject: [dpdk-dev] [PATCH v2 2/2] mk: fix the build dependency structure for dpaaX X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes the build dependency of various dpaaX components, when the dpaa or fslmc bus is disabled, or VFIO is disabled. Fixes: 1ee9569576f6 ("config: enable dpaaX drivers for generic ARMv8") Cc: stable@dpdk.org Reported-by: Yongseok Koh Suggested-by: Thomas Monjalon Signed-off-by: Hemant Agrawal --- drivers/bus/Makefile | 2 ++ drivers/bus/fslmc/Makefile | 4 ---- drivers/crypto/Makefile | 4 ++++ drivers/event/Makefile | 4 ++++ drivers/mempool/Makefile | 4 ++++ drivers/net/Makefile | 4 ++++ mk/rte.app.mk | 29 ++++++++++++++++++----------- 7 files changed, 36 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 7ef2593..c251b65 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -4,7 +4,9 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa +ifeq ($(CONFIG_RTE_EAL_VFIO),y) DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc +endif DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index de237f0..952b4c0 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -9,10 +9,6 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_bus_fslmc.a -ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_PMD),y) -CONFIG_RTE_LIBRTE_FSLMC_BUS = $(CONFIG_RTE_LIBRTE_DPAA2_PMD) -endif - CFLAGS += -DALLOW_EXPERIMENTAL_API ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT),y) CFLAGS += -O0 -g diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 628bd14..26e503e 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -14,7 +14,11 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc DIRS-$(CONFIG_RTE_LIBRTE_PMD_MRVL_CRYPTO) += mrvl DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec +endif +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec +endif include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/event/Makefile b/drivers/event/Makefile index c3d89a1..f301d8d 100644 --- a/drivers/event/Makefile +++ b/drivers/event/Makefile @@ -7,8 +7,12 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa +endif +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2 +endif DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile index aae2cb1..fc8b73b 100644 --- a/drivers/mempool/Makefile +++ b/drivers/mempool/Makefile @@ -3,8 +3,12 @@ include $(RTE_SDK)/mk/rte.vars.mk +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa +endif +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2 +endif DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e112732..39eb550 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -15,8 +15,12 @@ DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa +endif +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 +endif DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 3eb41d1..94525dc 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -113,11 +113,21 @@ endif _LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += -lrte_bus_pci _LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += -lrte_bus_vdev +_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa +ifeq ($(CONFIG_RTE_EAL_VFIO),y) +_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += -lrte_bus_fslmc +endif ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # plugins (link only if static libraries) _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += -lrte_mempool_stack +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) +_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa +endif +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) +_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += -lrte_mempool_dpaa2 +endif _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet _LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark @@ -128,11 +138,11 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += -lrte_pmd_bnxt _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond _LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += -lrte_bus_dpaa -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += -lrte_mempool_dpaa _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa endif +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2 +endif _LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 _LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena _LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic @@ -204,14 +214,10 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -lrte_pmd_armv8 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += -L$(ARMV8_CRYPTO_LIB_PATH) -larmv8_crypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MRVL_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mrvl_crypto -lmusdk _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler -ifeq ($(CONFIG_RTE_LIBRTE_FSLMC_BUS),y) +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_pmd_dpaa2_sec -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_mempool_dpaa2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += -lrte_bus_fslmc endif # CONFIG_RTE_LIBRTE_FSLMC_BUS - ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_bus_dpaa _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += -lrte_pmd_dpaa_sec endif # CONFIG_RTE_LIBRTE_DPAA_BUS @@ -221,8 +227,13 @@ ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf +ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event +endif # CONFIG_RTE_LIBRTE_DPAA_BUS +ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event +endif # CONFIG_RTE_LIBRTE_FSLMC_BUS + _LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx _LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event @@ -232,10 +243,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_pmd_skeleton_rawdev endif # CONFIG_RTE_LIBRTE_RAWDEV -ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_PMD),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_bus_fslmc -_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_mempool_dpaa2 -endif # CONFIG_RTE_LIBRTE_DPAA2_PMD endif # !CONFIG_RTE_BUILD_SHARED_LIBS