From 26ed1b2af70aaf5519e8a472638624fbbc2d7a48 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 12 Feb 2020 00:57:23 +0100 Subject: [PATCH] config: deduplicate options Some config options are overwritten with the same value as the one inherited from its template parent. Such duplicates which have no meaningful comments are removed. Signed-off-by: Thomas Monjalon Acked-by: David Marchand --- config/common_armv8a_linux | 2 -- config/common_linux | 6 ------ config/defconfig_arm-armv7a-linuxapp-gcc | 9 --------- config/defconfig_arm64-octeontx2-linuxapp-gcc | 4 ---- config/defconfig_arm64-stingray-linuxapp-gcc | 2 -- config/defconfig_arm64-thunderx-linuxapp-gcc | 1 - 6 files changed, 24 deletions(-) diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux index 433e66c7d8..020f8f006c 100644 --- a/config/common_armv8a_linux +++ b/config/common_armv8a_linux @@ -41,5 +41,3 @@ CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n # NXP PFE PMD Driver # CONFIG_RTE_LIBRTE_PFE_PMD=y - -CONFIG_RTE_SCHED_VECTOR=n diff --git a/config/common_linux b/config/common_linux index 583efadc7d..816810671a 100644 --- a/config/common_linux +++ b/config/common_linux @@ -66,9 +66,3 @@ CONFIG_RTE_LIBRTE_HINIC_PMD=y # Hisilicon HNS3 PMD driver # CONFIG_RTE_LIBRTE_HNS3_PMD=y - -# -# Compile PMD for Intel FPGA raw device -# To compile, CONFIG_RTE_EAL_VFIO should be enabled. -# -CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index 6ac7f47e47..9ecc2a526c 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -30,14 +30,7 @@ CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n # KNI is not supported on 32-bit CONFIG_RTE_LIBRTE_KNI=n -# PCI is usually not used on ARM -CONFIG_RTE_EAL_IGB_UIO=n - -# fails to compile on ARM -CONFIG_RTE_SCHED_VECTOR=n - # cannot use those on ARM -CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_LIBRTE_ARK_PMD=n CONFIG_RTE_LIBRTE_EM_PMD=n CONFIG_RTE_LIBRTE_IGB_PMD=n @@ -47,9 +40,7 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n CONFIG_RTE_LIBRTE_I40E_PMD=n CONFIG_RTE_LIBRTE_IXGBE_PMD=n -CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_VMXNET3_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_PMD=n CONFIG_RTE_LIBRTE_QEDE_PMD=n CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n CONFIG_RTE_LIBRTE_AVP_PMD=n diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc index 7687dbec8d..7cfb81872c 100644 --- a/config/defconfig_arm64-octeontx2-linuxapp-gcc +++ b/config/defconfig_arm64-octeontx2-linuxapp-gcc @@ -6,7 +6,6 @@ CONFIG_RTE_MACHINE="octeontx2" -CONFIG_RTE_CACHE_LINE_SIZE=128 CONFIG_RTE_MAX_NUMA_NODES=1 CONFIG_RTE_MAX_LCORE=24 CONFIG_RTE_ARM_FEATURE_ATOMICS=y @@ -15,8 +14,5 @@ CONFIG_RTE_ARM_FEATURE_ATOMICS=y CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n -# Recommend to use VFIO as co-processors needs SMMU/IOMMU -CONFIG_RTE_EAL_IGB_UIO=n - # Max supported NIX LFs CONFIG_RTE_MAX_VFIO_GROUPS=128 diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc index 7b33aa7afb..2a6f6cee28 100644 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ b/config/defconfig_arm64-stingray-linuxapp-gcc @@ -5,7 +5,6 @@ #include "defconfig_arm64-armv8a-linux-gcc" # Broadcom - Stingray -CONFIG_RTE_MACHINE="armv8a" CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" # Doesn't support NUMA @@ -13,4 +12,3 @@ CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n CONFIG_RTE_LIBRTE_VHOST_NUMA=n CONFIG_RTE_EAL_IGB_UIO=y -CONFIG_RTE_KNI_KMOD=n diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc index a52f066510..946906b67a 100644 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ b/config/defconfig_arm64-thunderx-linuxapp-gcc @@ -6,7 +6,6 @@ CONFIG_RTE_MACHINE="thunderx" -CONFIG_RTE_CACHE_LINE_SIZE=128 CONFIG_RTE_USE_C11_MEM_MODEL=n CONFIG_RTE_MAX_NUMA_NODES=2 CONFIG_RTE_MAX_LCORE=96 -- 2.20.1