diff options
| author |   srsurend <srsurend@cisco.com> | 2017-04-23 12:38:20 -0400 |
|---|---|---|
| committer | srsurend <srsurend@cisco.com> | 2017-05-22 07:04:56 -0400 |
| commit | bc253c90c5d13d14b658829cb1159c0467332a8f (patch) | |
| tree | 00d36195d7e2180de5bf81e63eece0a8bfe09929 /vpp/build-data | |
| parent | a23197980e40d4d9414bcfaf59005a1dc2a89251 (diff) | |
Change-Id: Ieb5c099c360cddd6f6b784da2838d543ceb1cb92
Signed-off-by: srsurend <srsurend@cisco.com>
Signed-off-by: sachin saxena <sachin.saxena@nxp.com>
Diffstat (limited to 'vpp/build-data')
| -rw-r--r-- | vpp/build-data/packages/vnet.mk | 6 | ||||
| -rw-r--r-- | vpp/build-data/packages/vpp.mk | 7 | ||||
| -rw-r--r-- | vpp/build-data/platforms/odp.mk | 55 |
3 files changed, 68 insertions, 0 deletions
diff --git a/vpp/build-data/packages/vnet.mk b/vpp/build-data/packages/vnet.mk index 399ca1b4..1e0605d3 100644 --- a/vpp/build-data/packages/vnet.mk +++ b/vpp/build-data/packages/vnet.mk @@ -16,6 +16,12 @@ vnet_LDFLAGS = $(call installed_libs_fn, \ vlib \ vlib-api) +#include ODP library only if ODP is being used. +ifeq ($($(PLATFORM)_uses_odp),yes) +vnet_CPPFLAGS += -I$($(PLATFORM)_odp_inc_dir) +vnet_LDFLAGS += -L$($(PLATFORM)_odp_lib_dir) +endif + ifeq ($($(PLATFORM)_enable_tests),yes) vnet_configure_args += --enable-tests endif diff --git a/vpp/build-data/packages/vpp.mk b/vpp/build-data/packages/vpp.mk index 6831c6b8..7a4f57ab 100644 --- a/vpp/build-data/packages/vpp.mk +++ b/vpp/build-data/packages/vpp.mk @@ -30,6 +30,13 @@ vpp_LDFLAGS = $(call installed_libs_fn, \ vlib-api \ vnet) +#include ODP library only if ODP is being used. +ifeq ($($(PLATFORM)_uses_odp),yes) +vpp_CPPFLAGS += -I$($(PLATFORM)_odp_inc_dir) +vpp_LDFLAGS += -L$($(PLATFORM)_odp_lib_dir) +export ODP_LIBS= $($(PLATFORM)_odp_libs) +endif + # include & link with openssl only if needed ifneq ($($(PLATFORM)_uses_openssl),no) vpp_CPPFLAGS += $(call installed_includes_fn, openssl) diff --git a/vpp/build-data/platforms/odp.mk b/vpp/build-data/platforms/odp.mk new file mode 100644 index 00000000..df2ae9e5 --- /dev/null +++ b/vpp/build-data/platforms/odp.mk @@ -0,0 +1,55 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# vector packet processor +odp_arch = native +ifeq ($(shell uname -m),x86_64) +odp_march = corei7 # Nehalem Instruction set +odp_mtune = corei7-avx # Optimize for Sandy Bridge +else +odp_march = native +odp_mtune = generic +endif +odp_native_tools = vppapigen + +odp_uses_dpdk = no +odp_uses_odp= yes +# Uncoment to enable building unit tests +#odp_enable_tests = yes + +odp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ + vpp-api gmod + +vlib_configure_args_odp = --with-pre-data=128 + +#ODP configuration parameters +odp_odp_libs = -lodp-dpdk -ldpdk -lpcap +odp_odp_inc_dir=$(ODP_INST_PATH)/include +odp_odp_lib_dir=$(ODP_INST_PATH)/lib +vpp_configure_args_odp = --with-odplib +vnet_configure_args_odp = --with-odplib + +odp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ + -fstack-protector-all -fPIC -Werror +odp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ + -fstack-protector-all -fPIC -Werror + +odp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ + -fstack-protector -fPIC -Werror +odp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ + -fstack-protector -fPIC -Werror + +odp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ + -fPIC -Werror -fprofile-arcs -ftest-coverage +odp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ + -fPIC -Werror -coverage |