X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms%2Fvpp.mk;h=acbe0e7fb1305a9b4374bf8070666083d74e034c;hb=d756b35032cdf7fdaaf0d6611388a54d32d72e92;hp=ee30763986f55feae0bfc6a61cae3a1959f28457;hpb=3ad7704fbb273440d649b96478e8e302d1285170;p=vpp.git

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index ee30763986f..acbe0e7fb13 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -12,21 +12,21 @@
 # limitations under the License.
 
 # vector packet processor
+
+MACHINE=$(shell uname -m)
+
 vpp_arch = native
-ifeq ($(shell uname -m),x86_64)
+ifeq ($(MACHINE),$(filter $(MACHINE),x86_64 i686))
 vpp_march = corei7			# Nehalem Instruction set
 vpp_mtune = corei7-avx			# Optimize for Sandy Bridge
-vpp_dpdk_arch = corei7
-else ifeq ($(shell uname -m),aarch64)
+else ifeq ($(MACHINE),aarch64)
 ifeq ($(TARGET_PLATFORM),thunderx)
 vpp_march = armv8-a+crc
 vpp_mtune = thunderx
-vpp_dpdk_arch = armv8a
 vpp_dpdk_target = arm64-thunderx-linuxapp-gcc
 else
 vpp_march = native
 vpp_mtune = generic
-vpp_dpdk_arch = native
 endif
 endif
 vpp_native_tools = vppapigen
@@ -36,12 +36,7 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp gmod
-
-vpp_configure_args_vpp = --with-dpdk
-
-# Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
-vlib_configure_args_vpp = --with-pre-data=128
+vpp_root_packages = vpp
 
 # DPDK configuration parameters
 # vpp_uses_dpdk_cryptodev_sw = yes
@@ -51,6 +46,11 @@ vlib_configure_args_vpp = --with-pre-data=128
 # vpp_dpdk_lib_dir = /usr/lib
 # vpp_dpdk_shared_lib = yes
 
+# 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 -march=$(MARCH) \
 	-fstack-protector-all -fPIC -Werror
 vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \