Gernerate dpdk config out of target specific files

DPDK 16.04 introduced new config parameter RTE_ARCH_X86
which was missing in the dpdk/Makefile

That caused issues with virtio devices on older kernels
(observed on 3.13.0).

This patch changes the source of generated config so
it will also include all defines in config/defconfig_TARGET
file.

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

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 04ab94d..38eef92 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -82,14 +82,9 @@ endef
 all: build
 
 $(B)/custom-config: $(B)/.patch.ok Makefile
-       @echo --- generating custom config from $(DPDK_SOURCE)/config/common_linuxapp ---
-       @cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/common_linuxapp $@
+       @echo --- generating custom config from $(DPDK_SOURCE)/config/defconfig_$(DPDK_TARGET) ---
+       @cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/defconfig_$(DPDK_TARGET) $@
        $(call set,RTE_MACHINE,$(DPDK_MACHINE))
-       $(call set,RTE_ARCH,"x86_64")
-       $(call set,RTE_ARCH_X86_64,y)
-       $(call set,RTE_ARCH_64,y)
-       $(call set,RTE_TOOLCHAIN_GCC,y)
-       $(call set,RTE_TOOLCHAIN,"gcc")
        @# modify options
        $(call set,RTE_MAX_LCORE,256)
        $(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))