diff options
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/vnet.mk | 8 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 8 | ||||
| -rw-r--r-- | build-data/platforms/arm32.mk | 37 |
3 files changed, 49 insertions, 4 deletions
diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk index 46d3c1d42dc..cafb93933bd 100644 --- a/build-data/packages/vnet.mk +++ b/build-data/packages/vnet.mk @@ -6,14 +6,12 @@ vnet_configure_depend = \ vnet_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api) vnet_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api) @@ -25,6 +23,12 @@ endif # Platform dependent configure flags vnet_configure_args += $(vnet_configure_args_$(PLATFORM)) +# include & link with openssl only if needed +ifneq ($($(PLATFORM)_uses_openssl),no) +vnet_CPPFLAGS += $(call installed_includes_fn, openssl) +vnet_LDFLAGS += $(call installed_libs_fn, openssl) +endif + ifneq ($($(PLATFORM)_uses_dpdk),no) ifeq ($($(PLATFORM)_uses_external_dpdk),yes) vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index f96235f4f0c..be10e17d200 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -18,7 +18,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM)) vpp_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api \ @@ -26,12 +25,17 @@ vpp_CPPFLAGS = $(call installed_includes_fn, \ vpp_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - openssl \ svm \ vlib \ vlib-api \ vnet) +# include & link with openssl only if needed +ifneq ($($(PLATFORM)_uses_openssl),no) +vpp_CPPFLAGS += $(call installed_includes_fn, openssl) +vpp_LDFLAGS += $(call installed_libs_fn, openssl) +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/arm32.mk b/build-data/platforms/arm32.mk new file mode 100644 index 00000000000..fecc5bbcadb --- /dev/null +++ b/build-data/platforms/arm32.mk @@ -0,0 +1,37 @@ +# 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 +arm32_arch = native +arm32_native_tools = vppapigen + +arm32_uses_dpdk = no +arm32_uses_openssl = no + +arm32_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ + vpp-japi gmod + +vlib_configure_args_arm32 = --with-pre-data=128 + +vnet_configure_args_arm32 = --without-vcgn --without-ipsec --without-ipv6sr +vpp_configure_args_arm32 = --without-vcgn --without-ipsec --without-ipv6sr + +arm32_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ + -fstack-protector-all -fPIC -Werror +arm32_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ + -fstack-protector-all -fPIC -Werror + +arm32_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ + -fstack-protector -fPIC -Werror +arm32_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ + -fstack-protector -fPIC -Werror |