summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Chemparathy <cchemparathy@ezchip.com>2015-07-09 16:25:13 +0800
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-07-13 16:15:52 +0200
commitc3ce2ad3548c034e00906e312453909914e6fb1a (patch)
treefd26e65763b56925e2292e620e58836411cc21c6
parentd67b8d7bd88123af2802c14a9815ecbac0567cfa (diff)
downloaddpdk-c3ce2ad3548c034e00906e312453909914e6fb1a.zip
dpdk-c3ce2ad3548c034e00906e312453909914e6fb1a.tar.gz
dpdk-c3ce2ad3548c034e00906e312453909914e6fb1a.tar.xz
config: remove combined library name option
The library name is now being pinned to "dpdk" instead of intel_dpdk, powerpc_dpdk, etc. As a result, we no longer need this config item. This patch removes it. Signed-off-by: Cyril Chemparathy <cchemparathy@ezchip.com> Signed-off-by: Zhigang Lu <zlu@ezchip.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
-rw-r--r--config/common_bsdapp1
-rw-r--r--config/common_linuxapp1
-rw-r--r--config/defconfig_ppc_64-power8-linuxapp-gcc2
-rw-r--r--mk/rte.vars.mk5
4 files changed, 1 insertions, 8 deletions
diff --git a/config/common_bsdapp b/config/common_bsdapp
index dfa61a3..7112f1c 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -87,7 +87,6 @@ CONFIG_RTE_BUILD_SHARED_LIB=n
# Combine to one single library
#
CONFIG_RTE_BUILD_COMBINE_LIBS=n
-CONFIG_RTE_LIBNAME=intel_dpdk
#
# Use newest code breaking previous ABI
diff --git a/config/common_linuxapp b/config/common_linuxapp
index f106d05..4d90d35 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -87,7 +87,6 @@ CONFIG_RTE_BUILD_SHARED_LIB=n
# Combine to one single library
#
CONFIG_RTE_BUILD_COMBINE_LIBS=n
-CONFIG_RTE_LIBNAME="intel_dpdk"
#
# Use newest code breaking previous ABI
diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc
index d97a885..f1af518 100644
--- a/config/defconfig_ppc_64-power8-linuxapp-gcc
+++ b/config/defconfig_ppc_64-power8-linuxapp-gcc
@@ -39,8 +39,6 @@ CONFIG_RTE_ARCH_64=y
CONFIG_RTE_TOOLCHAIN="gcc"
CONFIG_RTE_TOOLCHAIN_GCC=y
-CONFIG_RTE_LIBNAME="powerpc_dpdk"
-
# Note: Power doesn't have this support
CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n
diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 0469064..f87cf4b 100644
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -65,10 +65,7 @@ ifneq ($(BUILDING_RTE_SDK),)
RTE_SDK_BIN := $(RTE_OUTPUT)
endif
-RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
-ifeq ($(RTE_LIBNAME),)
-RTE_LIBNAME := intel_dpdk
-endif
+RTE_LIBNAME := dpdk
# RTE_TARGET is deducted from config when we are building the SDK.
# Else, when building an external app, RTE_TARGET must be specified