Re: [PATCH 07/50] net/liquidio: added Makefile
From: Ferruh Yigit <hidden>
Date: 2017-02-23 14:27:48
On 2/21/2017 9:26 AM, Shijith Thotton wrote:
Added Makefile and made build changes. Signed-off-by: Shijith Thotton <redacted> Signed-off-by: Jerin Jacob <redacted> Signed-off-by: Derek Chickles <redacted> Signed-off-by: Venkat Koppula <redacted> Signed-off-by: Mallesham Jatharakonda <redacted> ---
Thanks for splitting into functional patches, that helps a lot. But set starts with adding some set of files not used at this point. To build step by step incremental logic, can I suggest: 1) Make this first patch of the set with some updates: a) make SRC-y empty, not add lio_ethdev.c yet, it will come with 6/50 b) squash patch 2/50 with some updates [1] c) squash patch 3/50 to this patch d) squash patch 5/50 with some updates [2] 2) second patch can be 1/50 3) third patch can be 4/50, with adding DEBUG config option to config file 4) fourth patch can be 6/50, with adding lio_ethdev.c to SRC-y in Makefile 5) Rest can be same, only last patch that add document should update maintainers file to add documents to the list. [1] Only keep: ---> # +# Compile burst-oriented Cavium LiquidIO PMD driver +# +CONFIG_RTE_LIBRTE_LIO_PMD=y + ---> Leave rest of the DEBUG config option for the patch where lio_logs.h added, patch 4/50. [2] Only keep: ---> +Cavium LiquidIO +M: Shijith Thotton [off-list ref] +M: Srisivasubramanian Srinivasan [off-list ref] +F: drivers/net/liquidio/ + ---> Leave rest of document files to the patch where document added, patch 50/50. Thanks, ferruh
quoted hunk ↗ jump to hunk
drivers/net/Makefile | 1 + drivers/net/liquidio/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++ mk/rte.app.mk | 1 + 3 files changed, 61 insertions(+) create mode 100644 drivers/net/liquidio/Makefilediff --git a/drivers/net/Makefile b/drivers/net/Makefile index ab60cb8..2093e09 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile@@ -41,6 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe +DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5 DIRS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += mpipediff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile new file mode 100644 index 0000000..25685a7 --- /dev/null +++ b/drivers/net/liquidio/Makefile@@ -0,0 +1,59 @@ +# +# BSD LICENSE +# +# Copyright(c) 2017 Cavium, Inc.. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Cavium, Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_lio.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR) + +EXPORT_MAP := rte_pmd_lio_version.map + +LIBABIVER := 1 + +VPATH += $(RTE_SDK)/drivers/net/liquidio/base + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lib/librte_eal lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lib/librte_mempool lib/librte_mbuf + +include $(RTE_SDK)/mk/rte.lib.mkdiff --git a/mk/rte.app.mk b/mk/rte.app.mk index 236da9c..837cca5 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk@@ -116,6 +116,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += -lrte_pmd_kni endif +_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += -lrte_pmd_lio _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 -libverbs _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 -libverbs _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lrte_pmd_mpipe -lgxio