summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-04-26 10:44:28 +0200
committerOle Trøan <ot@cisco.com>2016-04-26 09:58:19 +0000
commit106f0eda8d42de69492d97db0cd8e046d9093786 (patch)
tree11548ceedd4916cc78bb4263889c5ce1835ec580
parent350dc1cd7811c75a1e7a026c5f92a10836c61083 (diff)
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>
-rw-r--r--dpdk/Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/dpdk/Makefile b/dpdk/Makefile
index 04ab94d3066..38eef929ecf 100644
--- 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))