Retire PLATFORM=virl

Change-Id: Iaf9735258f456574534c1a581b983326badea171
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/build-data/platforms/virl.mk b/build-data/platforms/virl.mk
deleted file mode 100644 (file)
index 3d5274a..0000000
--- a/build-data/platforms/virl.mk
+++ /dev/null
@@ -1,42 +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.
-
-# vector packet processor
-virl_arch = native
-virl_native_tools = vppapigen
-
-virl_uses_dpdk = yes
-
-virl_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \
-       vpp-api 
-
-vpp_configure_args_virl = --with-dpdk
-vnet_configure_args_virl = --with-dpdk --with-virl
-
-# Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
-vlib_configure_args_virl = --with-pre-data=128
-
-# Override default -march and CONFIG_RTE_MACHINE settings
-# Otherwise, illgal instructions will result
-virl_march=corei7
-virl_dpdk_arch=corei7
-
-virl_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-       -fstack-protector-all -fPIC
-virl_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-       -fstack-protector-all -fPIC
-
-virl_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-       -fstack-protector -fPIC
-virl_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-       -fstack-protector -fPIC

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index dcea38f..47e14b7 100644 (file)
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,7 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @IPV6SR@
+AM_CFLAGS = -Wall @DPDK@ @IPSEC@ @IPV6SR@
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =

diff --git a/vnet/configure.ac b/vnet/configure.ac
index 9afae52..439e5c6 100644 (file)
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -14,11 +14,6 @@ AC_ARG_WITH(dpdk,
             [with_dpdk=1],
             [with_dpdk=0])
 
-AC_ARG_WITH(virl,
-            AC_HELP_STRING([--with-virl],[Compile for virl citizenship]),
-            [with_virl=1],
-            [with_virl=0])
-
 AC_ARG_WITH(ipsec,
             AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
             [with_ipsec=0],
@@ -37,9 +32,6 @@ AC_ARG_ENABLE(tests,
 AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
 AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
 
-AM_CONDITIONAL(WITH_VIRL, test "$with_virl" = "1")
-AC_SUBST(VIRL,[-DVIRL=${with_virl}])
-
 AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
 AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
 

diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
index 5d2a2db..c44d9cc 100644 (file)
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/vnet/vnet/devices/dpdk/dpdk.h
@@ -332,7 +332,7 @@ typedef struct {
 
   /*
    * format interface names ala xxxEthernet%d/%d/%d instead of
-   * xxxEthernet%x/%x/%x. For VIRL.
+   * xxxEthernet%x/%x/%x.
    */
   u8 interface_name_format_decimal;