diff options
author | Sachin Saxena <sachin.saxena@nxp.com> | 2017-07-05 05:16:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2017-07-05 05:16:22 +0000 |
commit | 3d9c3c28b4dce1c6f66564ebbc3ecae85dcd7009 (patch) | |
tree | 3175cbb46106deb423d242f2be61c74968cda2d0 /build-data | |
parent | d338f4e38a0cc437cca49052787fdc976c46bf52 (diff) | |
parent | 704381d7bac04215ef270359f34658856c00d9a0 (diff) |
Merge "Introducing ODP plugin node" into 1707
Diffstat (limited to 'build-data')
-rw-r--r-- | build-data/packages/vpp.mk | 7 | ||||
-rw-r--r-- | build-data/platforms/odp.mk | 57 |
2 files changed, 64 insertions, 0 deletions
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 1acc59b2..3ff971c7 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -13,6 +13,13 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM)) vpp_CPPFLAGS = vpp_LDFLAGS = +#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 + ifneq ($($(PLATFORM)_uses_dpdk),no) ifeq ($($(PLATFORM)_uses_external_dpdk),yes) vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) diff --git a/build-data/platforms/odp.mk b/build-data/platforms/odp.mk new file mode 100644 index 00000000..d60c54cd --- /dev/null +++ b/build-data/platforms/odp.mk @@ -0,0 +1,57 @@ +# 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 + +# 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_uses_odp=yes +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 --disable-dpdk-plugin --disable-acl-plugin +vnet_configure_args_odp = --disable-dpdk-plugin --disable-acl-plugin + +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 |