From a85e0de8aebe0775fefc03872cd3162081c8885b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 4 Sep 2018 12:36:11 +0200 Subject: post move-to-cmake cleanup Change-Id: I87b8f054bbb54895429578dfe565e72331beb5b2 Signed-off-by: Damjan Marion --- build-data/packages/g2.mk | 16 ---------------- build-data/packages/perftool.mk | 18 ------------------ build-data/packages/vpp-platform-scripts.mk | 13 ------------- build-data/platforms/vpp.mk | 24 ------------------------ 4 files changed, 71 deletions(-) delete mode 100644 build-data/packages/g2.mk delete mode 100644 build-data/packages/perftool.mk delete mode 100644 build-data/packages/vpp-platform-scripts.mk (limited to 'build-data') diff --git a/build-data/packages/g2.mk b/build-data/packages/g2.mk deleted file mode 100644 index 1e9d77a1585..00000000000 --- a/build-data/packages/g2.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2015 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. - -g2_source = src - -g2_configure_args = --disable-vlib --disable-svm --enable-g2 diff --git a/build-data/packages/perftool.mk b/build-data/packages/perftool.mk deleted file mode 100644 index a549c2218ca..00000000000 --- a/build-data/packages/perftool.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2015 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. - -perftool_source = src - -perftool_configure_args = --disable-vlib --disable-svm --enable-perftool \ - --enable-dlmalloc - diff --git a/build-data/packages/vpp-platform-scripts.mk b/build-data/packages/vpp-platform-scripts.mk deleted file mode 100644 index 619add716b2..00000000000 --- a/build-data/packages/vpp-platform-scripts.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2015 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. -# diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 0687946dbb9..2b84f698006 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -19,33 +19,9 @@ vpp_arch = native ifeq ($(TARGET_PLATFORM),thunderx) vpp_dpdk_target = arm64-thunderx-linuxapp-gcc endif -vpp_native_tools = vppapigen - -vpp_uses_dpdk = yes - -# Uncoment to enable building unit tests -# vpp_enable_tests = yes vpp_root_packages = vpp vom japi -# DPDK configuration parameters -# vpp_uses_dpdk_mlx4_pmd = yes -# vpp_uses_dpdk_mlx5_pmd = yes -# vpp_uses_external_dpdk = yes -# vpp_dpdk_inc_dir = /usr/include/dpdk -# vpp_dpdk_lib_dir = /usr/lib -# vpp_dpdk_shared_lib = yes - -# Use '--without-libnuma' for non-numa aware architecture -# Use '--enable-dlmalloc' to use dlmalloc instead of mheap -vpp_configure_args_vpp = --enable-dlmalloc -sample-plugin_configure_args_vpp = --enable-dlmalloc - -# load balancer plugin is not portable on 32 bit platform -ifeq ($(MACHINE),i686) -vpp_configure_args_vpp += --disable-lb-plugin -endif - vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -- cgit 1.2.3-korg