diff --git a/MAINTAINERS b/MAINTAINERS
index 37f1f1fc56..3b16d7a4b8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,18 +94,12 @@ F: devtools/words-case.txt
 F: license/
 F: .editorconfig
 
-
 Build System
-------------
-M: Thomas Monjalon <thomas@monjalon.net>
+M: Bruce Richardson <bruce.richardson@intel.com>
 F: Makefile
-F: config/
-
-Meson build
-M: Bruce Richardson <bruce.richardson@intel.com>
 F: meson.build
 F: meson_options.txt
-F: config/rte_config.h
+F: config/
 F: buildtools/binutils-avx512-check.sh
 F: buildtools/call-sphinx-build.py
 F: buildtools/gen-pmdinfo-cfile.sh
diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux
deleted file mode 100644
index e942657a0f..0000000000
--- a/config/common_armv8a_linux
+++ /dev/null
@@ -1,43 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="armv8a"
-
-CONFIG_RTE_ARCH="arm64"
-CONFIG_RTE_ARCH_ARM64=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_FORCE_INTRINSICS=y
-
-# Maximum available cache line size in arm64 implementations.
-# Setting to maximum available cache line size in generic config
-# to address minimum DMA alignment across all arm64 implementations.
-CONFIG_RTE_CACHE_LINE_SIZE=128
-
-CONFIG_RTE_USE_C11_MEM_MODEL=y
-
-# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest)
-# to determine the best threshold in code. Refer to notes in source file
-# (lib/librte_eal/arm/include/rte_memcpy_64.h) for more info.
-CONFIG_RTE_ARCH_ARM64_MEMCPY=n
-#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048
-#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512
-# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're
-# strong reasons.
-#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n
-#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF
-#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n
-
-CONFIG_RTE_LIBRTE_IONIC_PMD=n
-CONFIG_RTE_LIBRTE_FM10K_PMD=n
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n
-
-#
-# NXP PFE PMD Driver
-#
-CONFIG_RTE_LIBRTE_PFE_PMD=y
diff --git a/config/common_base b/config/common_base
deleted file mode 100644
index fbf0ee70c8..0000000000
--- a/config/common_base
+++ /dev/null
@@ -1,1154 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-#
-# String that appears before the version number
-#
-CONFIG_RTE_VER_PREFIX="DPDK"
-
-#
-# Version information completed when this file is processed for a build
-#
-CONFIG_RTE_VER_YEAR=__YEAR
-CONFIG_RTE_VER_MONTH=__MONTH
-CONFIG_RTE_VER_MINOR=__MINOR
-CONFIG_RTE_VER_SUFFIX=__SUFFIX
-CONFIG_RTE_VER_RELEASE=__RELEASE
-
-#
-# define executive environment
-# RTE_EXEC_ENV values are the directories in mk/exec-env/
-#
-CONFIG_RTE_EXEC_ENV=
-
-#
-# define the architecture we compile for.
-# RTE_ARCH values are the directories in mk/arch/
-#
-CONFIG_RTE_ARCH=
-
-#
-# machine can define specific variables or action for a specific board
-# RTE_MACHINE values are the directories in mk/machine/
-#
-CONFIG_RTE_MACHINE=
-
-#
-# The compiler we use.
-# RTE_TOOLCHAIN values are the directories in mk/toolchain/
-#
-CONFIG_RTE_TOOLCHAIN=
-
-#
-# Use intrinsics or assembly code for key routines
-#
-CONFIG_RTE_FORCE_INTRINSICS=n
-
-#
-# Machine forces strict alignment constraints.
-#
-CONFIG_RTE_ARCH_STRICT_ALIGN=n
-
-#
-# Enable link time optimization
-#
-CONFIG_RTE_ENABLE_LTO=n
-
-#
-# Compile to share library
-#
-CONFIG_RTE_BUILD_SHARED_LIB=n
-
-#
-# Use newest code breaking previous ABI
-#
-CONFIG_RTE_NEXT_ABI=y
-
-#
-# Machine's cache line size
-#
-CONFIG_RTE_CACHE_LINE_SIZE=64
-
-#
-# Memory model
-#
-CONFIG_RTE_USE_C11_MEM_MODEL=n
-
-#
-# Compile Environment Abstraction Layer
-#
-CONFIG_RTE_LIBRTE_EAL=y
-CONFIG_RTE_MAX_LCORE=128
-CONFIG_RTE_MAX_NUMA_NODES=8
-CONFIG_RTE_MAX_HEAPS=32
-CONFIG_RTE_MAX_MEMSEG_LISTS=64
-# each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages
-# or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller
-CONFIG_RTE_MAX_MEMSEG_PER_LIST=8192
-CONFIG_RTE_MAX_MEM_MB_PER_LIST=32768
-# a "type" is a combination of page size and NUMA node. total number of memseg
-# lists per type will be limited to either RTE_MAX_MEMSEG_PER_TYPE pages (split
-# over multiple lists of RTE_MAX_MEMSEG_PER_LIST pages), or
-# RTE_MAX_MEM_MB_PER_TYPE megabytes of memory (split over multiple lists of
-# RTE_MAX_MEM_MB_PER_LIST), whichever is smaller
-CONFIG_RTE_MAX_MEMSEG_PER_TYPE=32768
-CONFIG_RTE_MAX_MEM_MB_PER_TYPE=131072
-# global maximum usable amount of VA, in megabytes
-CONFIG_RTE_MAX_MEM_MB=524288
-CONFIG_RTE_MAX_MEMZONE=2560
-CONFIG_RTE_MAX_TAILQ=32
-CONFIG_RTE_ENABLE_ASSERT=n
-CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO
-CONFIG_RTE_ENABLE_TRACE_FP=n
-CONFIG_RTE_LOG_HISTORY=256
-CONFIG_RTE_BACKTRACE=y
-CONFIG_RTE_LIBEAL_USE_HPET=n
-CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
-CONFIG_RTE_EAL_IGB_UIO=n
-CONFIG_RTE_EAL_VFIO=n
-CONFIG_RTE_MAX_VFIO_GROUPS=64
-CONFIG_RTE_MAX_VFIO_CONTAINERS=64
-CONFIG_RTE_MALLOC_DEBUG=n
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_USE_LIBBSD=n
-# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs,
-# calling these APIs put the cores in low power state while waiting
-# for the memory address to become equal to the expected value.
-# This is supported only by aarch64.
-CONFIG_RTE_ARM_USE_WFE=n
-
-#
-# Recognize/ignore the AVX/AVX512 CPU flags for performance/power testing.
-# AVX512 is marked as experimental for now, will enable it after enough
-# field test and possible optimization.
-#
-CONFIG_RTE_ENABLE_AVX=y
-CONFIG_RTE_ENABLE_AVX512=n
-
-# Use ARM LSE ATOMIC instructions
-CONFIG_RTE_ARM_FEATURE_ATOMICS=n
-
-# Default driver path (or "" to disable)
-CONFIG_RTE_EAL_PMD_PATH=""
-
-#
-# Compile Environment Abstraction Layer to support Vmware TSC map
-#
-CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y
-
-#
-# Compile the PCI library
-#
-CONFIG_RTE_LIBRTE_PCI=y
-
-#
-# Compile the argument parser library
-#
-CONFIG_RTE_LIBRTE_KVARGS=y
-
-#
-# Compile generic ethernet library
-#
-CONFIG_RTE_LIBRTE_ETHER=y
-CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n
-CONFIG_RTE_MAX_ETHPORTS=32
-CONFIG_RTE_MAX_QUEUES_PER_PORT=1024
-CONFIG_RTE_LIBRTE_IEEE1588=n
-CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16
-CONFIG_RTE_ETHDEV_RXTX_CALLBACKS=y
-CONFIG_RTE_ETHDEV_PROFILE_WITH_VTUNE=n
-
-#
-# Turn off Tx preparation stage
-#
-# Warning: rte_eth_tx_prepare() can be safely disabled only if using a
-# driver which do not implement any Tx preparation.
-#
-CONFIG_RTE_ETHDEV_TX_PREPARE_NOOP=n
-
-#
-# Common libraries, before Bus/PMDs
-#
-CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
-
-#
-# Compile the Intel FPGA bus
-#
-CONFIG_RTE_LIBRTE_IFPGA_BUS=y
-
-#
-# Compile PCI bus driver
-#
-CONFIG_RTE_LIBRTE_PCI_BUS=y
-
-#
-# Compile the vdev bus
-#
-CONFIG_RTE_LIBRTE_VDEV_BUS=y
-
-#
-# Compile ARK PMD
-#
-CONFIG_RTE_LIBRTE_ARK_PMD=y
-CONFIG_RTE_LIBRTE_ARK_PAD_TX=y
-CONFIG_RTE_LIBRTE_ARK_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_ARK_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS=n
-CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE=n
-
-#
-# Compile Aquantia Atlantic PMD driver
-#
-CONFIG_RTE_LIBRTE_ATLANTIC_PMD=y
-
-#
-# Compile AMD PMD
-#
-CONFIG_RTE_LIBRTE_AXGBE_PMD=y
-CONFIG_RTE_LIBRTE_AXGBE_PMD_DEBUG=n
-
-#
-# Compile burst-oriented Broadcom PMD driver
-#
-CONFIG_RTE_LIBRTE_BNX2X_PMD=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC=n
-
-#
-# Compile burst-oriented Broadcom BNXT PMD driver
-#
-CONFIG_RTE_LIBRTE_BNXT_PMD=y
-
-#
-# Compile burst-oriented Chelsio Terminator (CXGBE) PMD
-#
-CONFIG_RTE_LIBRTE_CXGBE_PMD=y
-
-#
-# Compile burst-oriented NXP PFE PMD driver
-#
-CONFIG_RTE_LIBRTE_PFE_PMD=n
-
-# NXP DPAA Bus
-CONFIG_RTE_LIBRTE_DPAA_BUS=n
-CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
-CONFIG_RTE_LIBRTE_DPAA_PMD=n
-CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n
-
-#
-# Compile NXP DPAA2 FSL-MC Bus
-#
-CONFIG_RTE_LIBRTE_FSLMC_BUS=n
-
-#
-# Compile Support Libraries for NXP DPAA2
-#
-CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
-CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y
-
-#
-# Compile burst-oriented NXP DPAA2 PMD driver
-#
-CONFIG_RTE_LIBRTE_DPAA2_PMD=n
-CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n
-
-#
-# Compile NXP ENETC PMD Driver
-#
-CONFIG_RTE_LIBRTE_ENETC_PMD=n
-
-#
-# Compile burst-oriented Amazon ENA PMD driver
-#
-CONFIG_RTE_LIBRTE_ENA_PMD=y
-CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n
-
-#
-# Compile burst-oriented Cisco ENIC PMD driver
-#
-CONFIG_RTE_LIBRTE_ENIC_PMD=y
-
-#
-# Compile burst-oriented IGB & EM PMD drivers
-#
-CONFIG_RTE_LIBRTE_EM_PMD=y
-CONFIG_RTE_LIBRTE_IGB_PMD=y
-CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n
-
-#
-# Compile burst-oriented HINIC PMD driver
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-
-#
-# Compile burst-oriented HNS3 PMD driver
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
-
-#
-# Compile Pensando IONIC PMD driver
-#
-CONFIG_RTE_LIBRTE_IONIC_PMD=y
-
-#
-# Compile burst-oriented IXGBE PMD driver
-#
-CONFIG_RTE_LIBRTE_IXGBE_PMD=y
-CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n
-CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n
-
-#
-# Compile burst-oriented I40E PMD driver
-#
-CONFIG_RTE_LIBRTE_I40E_PMD=y
-CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y
-CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y
-CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n
-CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64
-CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4
-
-#
-# Compile burst-oriented FM10K PMD
-#
-CONFIG_RTE_LIBRTE_FM10K_PMD=y
-CONFIG_RTE_LIBRTE_FM10K_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_FM10K_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y
-CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y
-
-#
-# Compile burst-oriented ICE PMD driver
-#
-CONFIG_RTE_LIBRTE_ICE_PMD=y
-CONFIG_RTE_LIBRTE_ICE_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_ICE_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_ICE_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_ICE_16BYTE_RX_DESC=n
-
-# Compile burst-oriented IAVF PMD driver
-#
-CONFIG_RTE_LIBRTE_IAVF_PMD=y
-CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IAVF_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IAVF_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC=n
-CONFIG_RTE_LIBRTE_IAVF_16BYTE_RX_DESC=n
-#
-# Compile burst-oriented IPN3KE PMD driver
-#
-CONFIG_RTE_LIBRTE_IPN3KE_PMD=n
-
-#
-# Compile burst-oriented IGC PMD drivers
-#
-CONFIG_RTE_LIBRTE_IGC_PMD=y
-CONFIG_RTE_LIBRTE_IGC_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IGC_DEBUG_TX=n
-
-#
-# Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD
-#
-CONFIG_RTE_LIBRTE_MLX4_PMD=n
-CONFIG_RTE_LIBRTE_MLX4_DEBUG=n
-
-#
-# Compile burst-oriented Mellanox ConnectX-4, ConnectX-5,
-# ConnectX-6 & BlueField (MLX5) PMD
-#
-CONFIG_RTE_LIBRTE_MLX5_PMD=n
-CONFIG_RTE_LIBRTE_MLX5_DEBUG=n
-
-#
-# Compile regex-oriented Mellanox PMD
-#
-CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD=n
-
-#
-# Compile vdpa-oriented Mellanox ConnectX-6 & BlueField (MLX5) PMD
-#
-CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD=n
-
-# Linking method for mlx4/5 dependency on ibverbs and related libraries
-# Default linking is dynamic by linker.
-# Other options are: dynamic by dlopen at run-time, or statically embedded.
-CONFIG_RTE_IBVERBS_LINK_DLOPEN=n
-CONFIG_RTE_IBVERBS_LINK_STATIC=n
-
-#
-# Compile burst-oriented Netronome NFP PMD driver
-#
-CONFIG_RTE_LIBRTE_NFP_PMD=n
-CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n
-
-# QLogic 10G/25G/40G/50G/100G PMD
-#
-CONFIG_RTE_LIBRTE_QEDE_PMD=y
-CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n
-#Provides abs path/name of the firmware file.
-#Empty string denotes driver will use default firmware
-CONFIG_RTE_LIBRTE_QEDE_FW=""
-
-#
-# Compile burst-oriented Solarflare libefx-based PMD
-#
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y
-CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n
-
-#
-# Compile software PMD backed by SZEDATA2 device
-#
-CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n
-
-#
-# Compile software PMD backed by NFB device
-#
-CONFIG_RTE_LIBRTE_NFB_PMD=n
-
-#
-# Compile burst-oriented Cavium Thunderx NICVF PMD driver
-#
-CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=y
-CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX=n
-
-#
-# Compile burst-oriented Cavium LiquidIO PMD driver
-#
-CONFIG_RTE_LIBRTE_LIO_PMD=y
-CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n
-CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n
-
-#
-# Compile burst-oriented Cavium OCTEONTX network PMD driver
-#
-CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y
-
-#
-# Compile burst-oriented Marvell OCTEON TX2 network PMD driver
-#
-CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y
-
-#
-# Compile WRS accelerated virtual port (AVP) guest PMD driver
-#
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-CONFIG_RTE_LIBRTE_AVP_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_AVP_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
-
-#
-# Compile burst-oriented VIRTIO PMD driver
-#
-CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
-CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
-
-#
-# Compile virtio device emulation inside virtio PMD driver
-#
-CONFIG_RTE_VIRTIO_USER=n
-
-#
-# Compile burst-oriented VMXNET3 PMD driver
-#
-CONFIG_RTE_LIBRTE_VMXNET3_PMD=y
-CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE=n
-
-#
-# Compile software PMD backed by AF_PACKET sockets (Linux only)
-#
-CONFIG_RTE_LIBRTE_PMD_AF_PACKET=n
-
-#
-# Compile software PMD backed by AF_XDP sockets (Linux only)
-#
-CONFIG_RTE_LIBRTE_PMD_AF_XDP=n
-
-#
-# Compile Memory Interface PMD driver (Linux only)
-#
-CONFIG_RTE_LIBRTE_PMD_MEMIF=n
-
-#
-# Compile link bonding PMD library
-#
-CONFIG_RTE_LIBRTE_PMD_BOND=y
-CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n
-CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n
-
-#
-# Compile fail-safe PMD
-#
-CONFIG_RTE_LIBRTE_PMD_FAILSAFE=y
-
-#
-# Compile Marvell PMD driver
-#
-CONFIG_RTE_LIBRTE_MVPP2_PMD=n
-
-#
-# Compile Marvell MVNETA PMD driver
-#
-CONFIG_RTE_LIBRTE_MVNETA_PMD=n
-
-#
-# Compile support for VMBus library
-#
-CONFIG_RTE_LIBRTE_VMBUS=n
-
-#
-# Compile native PMD for Hyper-V/Azure
-#
-CONFIG_RTE_LIBRTE_NETVSC_PMD=n
-CONFIG_RTE_LIBRTE_NETVSC_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_NETVSC_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_NETVSC_DEBUG_DUMP=n
-
-#
-# Compile virtual device driver for NetVSC on Hyper-V/Azure
-#
-CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=n
-
-#
-# Compile null PMD
-#
-CONFIG_RTE_LIBRTE_PMD_NULL=y
-
-#
-# Compile software PMD backed by PCAP files
-#
-CONFIG_RTE_LIBRTE_PMD_PCAP=n
-
-#
-# Compile example software rings based PMD
-#
-CONFIG_RTE_LIBRTE_PMD_RING=y
-CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16
-CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16
-
-#
-# Compile SOFTNIC PMD
-#
-CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n
-
-#
-# Compile the TAP PMD
-# It is enabled by default for Linux only.
-#
-CONFIG_RTE_LIBRTE_PMD_TAP=n
-
-#
-# Do prefetch of packet data within PMD driver receive function
-#
-CONFIG_RTE_PMD_PACKET_PREFETCH=y
-
-# Compile generic wireless base band device library
-# EXPERIMENTAL: API may change without prior notice
-#
-CONFIG_RTE_LIBRTE_BBDEV=y
-CONFIG_RTE_LIBRTE_BBDEV_DEBUG=n
-CONFIG_RTE_BBDEV_MAX_DEVS=128
-CONFIG_RTE_BBDEV_OFFLOAD_COST=y
-CONFIG_RTE_BBDEV_SDK_AVX2=n
-CONFIG_RTE_BBDEV_SDK_AVX512=n
-
-#
-# Compile PMD for NULL bbdev device
-#
-CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL=y
-
-#
-# Compile PMD for turbo software bbdev device
-#
-CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y
-
-#
-# Compile PMD for Intel FPGA LTE FEC bbdev device
-#
-CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y
-
-#
-# Compile PMD for Intel FPGA 5GNR FEC bbdev device
-#
-CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC=y
-
-#
-# Compile generic crypto device library
-#
-CONFIG_RTE_LIBRTE_CRYPTODEV=y
-CONFIG_RTE_CRYPTO_MAX_DEVS=64
-
-#
-# Compile PMD for ARMv8 Crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n
-
-#
-# Compile NXP CAAM JR crypto Driver
-#
-CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
-CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE=n
-
-#
-# Compile NXP DPAA2 crypto sec driver for CAAM HW
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
-
-#
-# NXP DPAA caam - crypto driver
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
-CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4
-
-#
-# Compile PMD for Cavium OCTEON TX crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO=y
-
-#
-# Compile PMD for Marvell OCTEON TX2 crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=y
-
-#
-# Compile PMD for QuickAssist based devices - see docs for details
-#
-CONFIG_RTE_LIBRTE_PMD_QAT=y
-CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n
-CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n
-#
-# Max. number of QuickAssist devices, which can be detected and attached
-#
-CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48
-CONFIG_RTE_PMD_QAT_COMP_IM_BUFFER_SIZE=65536
-
-#
-# Compile PMD for virtio crypto devices
-#
-CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO=y
-#
-# Number of maximum virtio crypto devices
-#
-CONFIG_RTE_MAX_VIRTIO_CRYPTO=32
-
-#
-# Compile PMD for AESNI backed device
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
-
-#
-# Compile PMD for Software backed device
-#
-CONFIG_RTE_LIBRTE_PMD_OPENSSL=n
-
-#
-# Compile PMD for AESNI GCM device
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n
-
-#
-# Compile PMD for SNOW 3G device
-#
-CONFIG_RTE_LIBRTE_PMD_SNOW3G=n
-CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG=n
-
-#
-# Compile PMD for KASUMI device
-#
-CONFIG_RTE_LIBRTE_PMD_KASUMI=n
-
-#
-# Compile PMD for ZUC device
-#
-CONFIG_RTE_LIBRTE_PMD_ZUC=n
-
-# Compile PMD for Crypto Scheduler device
-#
-CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER=y
-
-#
-# Compile PMD for NULL Crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y
-
-#
-# Compile PMD for AMD CCP crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_CCP=n
-
-#
-# Compile PMD for Marvell Crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=n
-
-#
-# Compile PMD for NITROX crypto device
-#
-CONFIG_RTE_LIBRTE_PMD_NITROX=y
-
-#
-# Compile generic security library
-#
-CONFIG_RTE_LIBRTE_SECURITY=y
-
-#
-# Compile generic compression device library
-#
-CONFIG_RTE_LIBRTE_COMPRESSDEV=y
-CONFIG_RTE_COMPRESS_MAX_DEVS=64
-
-#
-# Compile compressdev unit test
-#
-CONFIG_RTE_COMPRESSDEV_TEST=n
-
-#
-# Compile PMD for Octeontx ZIPVF compression device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF=y
-
-#
-# Compile PMD for ISA-L compression device
-#
-CONFIG_RTE_LIBRTE_PMD_ISAL=n
-
-#
-# Compile PMD for ZLIB compression device
-#
-CONFIG_RTE_LIBRTE_PMD_ZLIB=n
-
-#
-# Compile RegEx device support
-#
-CONFIG_RTE_LIBRTE_REGEXDEV=y
-CONFIG_RTE_LIBRTE_REGEXDEV_DEBUG=n
-CONFIG_RTE_MAX_REGEXDEV_DEVS=32
-
-#
-# Compile generic event device library
-#
-CONFIG_RTE_LIBRTE_EVENTDEV=y
-CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n
-CONFIG_RTE_EVENT_MAX_DEVS=16
-CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64
-CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32
-CONFIG_RTE_EVENT_ETH_INTR_RING_SIZE=1024
-CONFIG_RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE=32
-CONFIG_RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE=32
-
-#
-# Compile PMD for skeleton event device
-#
-CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV=y
-CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG=n
-
-#
-# Compile PMD for software event device
-#
-CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y
-
-#
-# Compile PMD for distributed software event device
-#
-CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV=y
-
-#
-# Compile PMD for octeontx sso event device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y
-
-#
-# Compile PMD for octeontx2 sso event device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=y
-
-#
-# Compile PMD for OPDL event device
-#
-CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=y
-
-#
-# Compile PMD for NXP DPAA event device
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
-
-#
-# Compile PMD for NXP DPAA2 event device
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
-
-#
-# Compile raw device support
-# EXPERIMENTAL: API may change without prior notice
-#
-CONFIG_RTE_LIBRTE_RAWDEV=y
-CONFIG_RTE_RAWDEV_MAX_DEVS=64
-CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV=y
-
-#
-# Compile PMD for NXP DPAA2 CMDIF raw device
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
-
-#
-# Compile PMD for NXP DPAA2 QDMA raw device
-#
-CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
-
-#
-# Compile PMD for Intel FPGA raw device
-#
-CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n
-
-#
-# Compile PMD for Intel IOAT raw device
-#
-CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=y
-
-#
-# Compile PMD for octeontx2 DMA raw device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=y
-
-#
-# Compile PMD for octeontx2 EP raw device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=y
-
-#
-# Compile PMD for NTB raw device
-#
-CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV=y
-
-#
-# Compile librte_ring
-#
-CONFIG_RTE_LIBRTE_RING=y
-
-#
-# Compile librte_stack
-#
-CONFIG_RTE_LIBRTE_STACK=y
-
-#
-# Compile librte_mempool
-#
-CONFIG_RTE_LIBRTE_MEMPOOL=y
-CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512
-CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n
-
-#
-# Compile Mempool drivers
-#
-CONFIG_RTE_DRIVER_MEMPOOL_BUCKET=y
-CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB=64
-CONFIG_RTE_DRIVER_MEMPOOL_RING=y
-CONFIG_RTE_DRIVER_MEMPOOL_STACK=y
-
-#
-# Compile PMD for octeontx fpa mempool device
-#
-CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=y
-
-#
-# Compile PMD for octeontx2 npa mempool device
-#
-CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=y
-
-#
-# Compile librte_mbuf
-#
-CONFIG_RTE_LIBRTE_MBUF=y
-CONFIG_RTE_LIBRTE_MBUF_DEBUG=n
-CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS="ring_mp_mc"
-CONFIG_RTE_MBUF_REFCNT_ATOMIC=y
-CONFIG_RTE_PKTMBUF_HEADROOM=128
-
-#
-# Compile librte_timer
-#
-CONFIG_RTE_LIBRTE_TIMER=y
-CONFIG_RTE_LIBRTE_TIMER_DEBUG=n
-
-#
-# Compile librte_cfgfile
-#
-CONFIG_RTE_LIBRTE_CFGFILE=y
-
-#
-# Compile librte_cmdline
-#
-CONFIG_RTE_LIBRTE_CMDLINE=y
-CONFIG_RTE_LIBRTE_CMDLINE_DEBUG=n
-
-#
-# Compile librte_hash
-#
-CONFIG_RTE_LIBRTE_HASH=y
-CONFIG_RTE_LIBRTE_HASH_DEBUG=n
-
-#
-# Compile librte_efd
-#
-CONFIG_RTE_LIBRTE_EFD=y
-
-#
-# Compile librte_member
-#
-CONFIG_RTE_LIBRTE_MEMBER=y
-
-#
-# Compile librte_jobstats
-#
-CONFIG_RTE_LIBRTE_JOBSTATS=y
-
-#
-# Compile the device metrics library
-#
-CONFIG_RTE_LIBRTE_METRICS=y
-
-#
-# Compile the bitrate statistics library
-#
-CONFIG_RTE_LIBRTE_BITRATE=y
-
-#
-# Compile the latency statistics library
-#
-CONFIG_RTE_LIBRTE_LATENCY_STATS=y
-
-#
-# Compile librte_telemetry legacy support
-#
-CONFIG_RTE_LIBRTE_TELEMETRY=n
-
-#
-# Compile librte_rcu
-#
-CONFIG_RTE_LIBRTE_RCU=y
-CONFIG_RTE_LIBRTE_RCU_DEBUG=n
-
-#
-# Compile librte_rib
-#
-CONFIG_RTE_LIBRTE_RIB=y
-
-#
-# Compile librte_fib
-#
-CONFIG_RTE_LIBRTE_FIB=y
-CONFIG_RTE_LIBRTE_FIB_DEBUG=n
-
-#
-# Compile librte_lpm
-#
-CONFIG_RTE_LIBRTE_LPM=y
-CONFIG_RTE_LIBRTE_LPM_DEBUG=n
-
-#
-# Compile librte_acl
-#
-CONFIG_RTE_LIBRTE_ACL=y
-CONFIG_RTE_LIBRTE_ACL_DEBUG=n
-
-#
-# Compile librte_power
-#
-CONFIG_RTE_LIBRTE_POWER=n
-CONFIG_RTE_LIBRTE_POWER_DEBUG=n
-CONFIG_RTE_MAX_LCORE_FREQS=64
-
-#
-# Compile librte_net
-#
-CONFIG_RTE_LIBRTE_NET=y
-
-#
-# Compile librte_ip_frag
-#
-CONFIG_RTE_LIBRTE_IP_FRAG=y
-CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n
-CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4
-CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n
-
-#
-# Compile GRO library
-#
-CONFIG_RTE_LIBRTE_GRO=y
-
-#
-# Compile GSO library
-#
-CONFIG_RTE_LIBRTE_GSO=y
-
-#
-# Compile librte_meter
-#
-CONFIG_RTE_LIBRTE_METER=y
-
-#
-# Compile librte_classify
-#
-CONFIG_RTE_LIBRTE_FLOW_CLASSIFY=y
-
-#
-# Compile librte_sched
-#
-CONFIG_RTE_LIBRTE_SCHED=y
-CONFIG_RTE_SCHED_DEBUG=n
-CONFIG_RTE_SCHED_RED=n
-CONFIG_RTE_SCHED_COLLECT_STATS=n
-CONFIG_RTE_SCHED_SUBPORT_TC_OV=n
-CONFIG_RTE_SCHED_PORT_N_GRINDERS=8
-CONFIG_RTE_SCHED_VECTOR=n
-
-#
-# Compile the distributor library
-#
-CONFIG_RTE_LIBRTE_DISTRIBUTOR=y
-
-#
-# Compile the reorder library
-#
-CONFIG_RTE_LIBRTE_REORDER=y
-
-#
-# Compile librte_port
-#
-CONFIG_RTE_LIBRTE_PORT=y
-CONFIG_RTE_PORT_STATS_COLLECT=n
-CONFIG_RTE_PORT_PCAP=n
-
-#
-# Compile librte_table
-#
-CONFIG_RTE_LIBRTE_TABLE=y
-CONFIG_RTE_TABLE_STATS_COLLECT=n
-
-#
-# Compile librte_pipeline
-#
-CONFIG_RTE_LIBRTE_PIPELINE=y
-CONFIG_RTE_PIPELINE_STATS_COLLECT=n
-
-#
-# Compile librte_kni
-#
-CONFIG_RTE_LIBRTE_KNI=n
-CONFIG_RTE_LIBRTE_PMD_KNI=n
-CONFIG_RTE_KNI_KMOD=n
-CONFIG_RTE_KNI_PREEMPT_DEFAULT=y
-
-#
-# Compile the pdump library
-#
-CONFIG_RTE_LIBRTE_PDUMP=y
-
-#
-# Compile vhost user library
-#
-CONFIG_RTE_LIBRTE_VHOST=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
-
-#
-# Compile vhost PMD
-# To compile, CONFIG_RTE_LIBRTE_VHOST should be enabled.
-#
-CONFIG_RTE_LIBRTE_PMD_VHOST=n
-
-#
-# Compile IFC driver
-# To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO
-# should be enabled.
-#
-CONFIG_RTE_LIBRTE_IFC_PMD=n
-
-#
-# Compile librte_bpf
-#
-CONFIG_RTE_LIBRTE_BPF=y
-# allow load BPF from ELF files (requires libelf)
-CONFIG_RTE_LIBRTE_BPF_ELF=n
-
-#
-# Compile librte_ipsec
-#
-CONFIG_RTE_LIBRTE_IPSEC=y
-
-#
-# Compile librte_graph
-#
-CONFIG_RTE_LIBRTE_GRAPH=y
-CONFIG_RTE_GRAPH_BURST_SIZE=256
-CONFIG_RTE_LIBRTE_GRAPH_STATS=y
-
-#
-# Compile librte_node
-#
-CONFIG_RTE_LIBRTE_NODE=y
-
-#
-# Compile the test application
-#
-CONFIG_RTE_APP_TEST=y
-CONFIG_RTE_APP_TEST_RESOURCE_TAR=n
-
-#
-# Compile the procinfo application
-#
-CONFIG_RTE_PROC_INFO=n
-
-#
-# Compile the PMD test application
-#
-CONFIG_RTE_TEST_PMD=y
-CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n
-CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n
-
-#
-# Compile the rte flow perf application
-#
-CONFIG_RTE_TEST_FLOW_PERF=y
-
-#
-# Compile the bbdev test application
-#
-CONFIG_RTE_TEST_BBDEV=y
-
-#
-# Compile the compression performance application
-#
-CONFIG_RTE_APP_COMPRESS_PERF=y
-
-#
-# Compile the crypto performance application
-#
-CONFIG_RTE_APP_CRYPTO_PERF=y
-
-#
-# Compile the eventdev application
-#
-CONFIG_RTE_APP_EVENTDEV=y
diff --git a/config/common_freebsd b/config/common_freebsd
deleted file mode 100644
index 456b394c4d..0000000000
--- a/config/common_freebsd
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-#include "common_base"
-
-CONFIG_RTE_EXEC_ENV="bsdapp"
-CONFIG_RTE_EXEC_ENV_BSDAPP=y
-CONFIG_RTE_EXEC_ENV_FREEBSD=y
-
-#
-# FreeBSD contiguous memory driver settings
-#
-CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64
-CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2
-CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024
diff --git a/config/common_linux b/config/common_linux
deleted file mode 100644
index 816810671a..0000000000
--- a/config/common_linux
+++ /dev/null
@@ -1,68 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-#include "common_base"
-
-CONFIG_RTE_EXEC_ENV="linuxapp"
-CONFIG_RTE_EXEC_ENV_LINUX=y
-CONFIG_RTE_EXEC_ENV_LINUXAPP=y
-
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y
-CONFIG_RTE_EAL_VFIO=y
-CONFIG_RTE_LIBRTE_KNI=y
-CONFIG_RTE_LIBRTE_PMD_KNI=y
-CONFIG_RTE_LIBRTE_VHOST=y
-CONFIG_RTE_LIBRTE_VHOST_NUMA=y
-CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n
-CONFIG_RTE_LIBRTE_PMD_VHOST=y
-CONFIG_RTE_LIBRTE_IFC_PMD=y
-CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y
-CONFIG_RTE_LIBRTE_PMD_MEMIF=y
-CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y
-CONFIG_RTE_LIBRTE_PMD_TAP=y
-CONFIG_RTE_LIBRTE_AVP_PMD=y
-CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y
-CONFIG_RTE_LIBRTE_NFP_PMD=y
-CONFIG_RTE_LIBRTE_POWER=y
-CONFIG_RTE_VIRTIO_USER=y
-CONFIG_RTE_PROC_INFO=y
-
-CONFIG_RTE_LIBRTE_VMBUS=y
-CONFIG_RTE_LIBRTE_NETVSC_PMD=y
-
-#
-# Common libraries, before Bus/PMDs
-#
-CONFIG_RTE_LIBRTE_COMMON_DPAAX=y
-
-# NXP DPAA BUS and drivers
-CONFIG_RTE_LIBRTE_DPAA_BUS=y
-CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y
-CONFIG_RTE_LIBRTE_DPAA_PMD=y
-CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y
-CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y
-CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y
-
-# NXP FSLMC BUS and DPAA2 drivers
-CONFIG_RTE_LIBRTE_FSLMC_BUS=y
-CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y
-CONFIG_RTE_LIBRTE_DPAA2_PMD=y
-CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y
-CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y
-CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y
-CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y
-
-#
-# NXP ENETC PMD Driver
-#
-CONFIG_RTE_LIBRTE_ENETC_PMD=y
-
-#
-# HINIC PMD driver
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=y
-
-#
-# Hisilicon HNS3 PMD driver
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=y
diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc
deleted file mode 120000
index 84619de43a..0000000000
--- a/config/defconfig_arm-armv7a-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm-armv7a-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc
deleted file mode 100644
index ac91120868..0000000000
--- a/config/defconfig_arm-armv7a-linuxapp-gcc
+++ /dev/null
@@ -1,49 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2015 RehiveTech. All right reserved.
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="armv7a"
-
-CONFIG_RTE_ARCH="arm"
-CONFIG_RTE_ARCH_ARM=y
-CONFIG_RTE_ARCH_ARMv7=y
-CONFIG_RTE_ARCH_ARM_TUNE="cortex-a9"
-
-# Accelerate memcpy operations. Consider enabling for Cortex-A15.
-# For Cortex-A7 and Cortex-A9, It might accelerate short data copies (< 64 B).
-CONFIG_RTE_ARCH_ARM_NEON_MEMCPY=n
-
-CONFIG_RTE_FORCE_INTRINSICS=y
-CONFIG_RTE_ARCH_STRICT_ALIGN=y
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
-
-# NUMA is not supported on ARM
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-
-# ARM doesn't have support for vmware TSC map
-CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n
-
-# KNI is not supported on 32-bit
-CONFIG_RTE_LIBRTE_KNI=n
-
-# cannot use those on ARM
-CONFIG_RTE_LIBRTE_ARK_PMD=n
-CONFIG_RTE_LIBRTE_EM_PMD=n
-CONFIG_RTE_LIBRTE_IGB_PMD=n
-CONFIG_RTE_LIBRTE_CXGBE_PMD=n
-CONFIG_RTE_LIBRTE_E1000_PMD=n
-CONFIG_RTE_LIBRTE_ENIC_PMD=n
-CONFIG_RTE_LIBRTE_FM10K_PMD=n
-CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
-CONFIG_RTE_LIBRTE_QEDE_PMD=n
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-CONFIG_RTE_LIBRTE_NFP_PMD=n
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
-CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n
-CONFIG_RTE_LIBRTE_IONIC_PMD=n
diff --git a/config/defconfig_arm64-armada-linux-gcc b/config/defconfig_arm64-armada-linux-gcc
deleted file mode 120000
index 64ce2a5687..0000000000
--- a/config/defconfig_arm64-armada-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-armada-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-armada-linuxapp-gcc b/config/defconfig_arm64-armada-linuxapp-gcc
deleted file mode 100644
index a49bebe374..0000000000
--- a/config/defconfig_arm64-armada-linuxapp-gcc
+++ /dev/null
@@ -1,41 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-#
-# Compile Environment Abstraction Layer
-#
-CONFIG_RTE_MAX_LCORE=16
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_CACHE_LINE_SIZE=64
-
-# Enable PMDs
-CONFIG_RTE_LIBRTE_MVEP_COMMON=y
-CONFIG_RTE_LIBRTE_MVPP2_PMD=y
-CONFIG_RTE_LIBRTE_MVNETA_PMD=y
-CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO=y
-
-# Disable NXP as it is conflict with MUSDK
-CONFIG_RTE_LIBRTE_DPAA_BUS=n
-CONFIG_RTE_LIBRTE_COMMON_DPAAX=n
-CONFIG_RTE_LIBRTE_FSLMC_BUS=n
-CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=n
-CONFIG_RTE_LIBRTE_DPAA2_PMD=n
-CONFIG_RTE_LIBRTE_DPAA_BUS=n
-CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n
-CONFIG_RTE_LIBRTE_DPAA_PMD=n
-CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=n
-CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=n
-CONFIG_RTE_LIBRTE_PMD_CAAM_JR=n
-CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=n
-CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=n
-CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=n
-CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n
-CONFIG_RTE_LIBRTE_PFE_PMD=n
-CONFIG_RTE_LIBRTE_ENETC_PMD=n
-
-# Doesn't support NUMA
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang
deleted file mode 120000
index 196808b982..0000000000
--- a/config/defconfig_arm64-armv8a-linux-clang
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-armv8a-linuxapp-clang
\ No newline at end of file
diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc
deleted file mode 120000
index 0949519562..0000000000
--- a/config/defconfig_arm64-armv8a-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-armv8a-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang
deleted file mode 100644
index d3b4dad532..0000000000
--- a/config/defconfig_arm64-armv8a-linuxapp-clang
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-#include "common_armv8a_linux"
-
-CONFIG_RTE_TOOLCHAIN="clang"
-CONFIG_RTE_TOOLCHAIN_CLANG=y
diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc
deleted file mode 100644
index 58c4a4029a..0000000000
--- a/config/defconfig_arm64-armv8a-linuxapp-gcc
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#include "common_armv8a_linux"
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
-CONFIG_RTE_MAX_LCORE=256
diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc
deleted file mode 120000
index dad37d5e79..0000000000
--- a/config/defconfig_arm64-bluefield-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-bluefield-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc
deleted file mode 100644
index b496538819..0000000000
--- a/config/defconfig_arm64-bluefield-linuxapp-gcc
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Mellanox Technologies, Ltd
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-# Mellanox BlueField
-CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72"
-
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_CACHE_LINE_SIZE=64
-
-# UMA architecture
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-
-# PMD for ConnectX-5
-CONFIG_RTE_LIBRTE_MLX5_PMD=y
diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc
deleted file mode 120000
index dc05caacf3..0000000000
--- a/config/defconfig_arm64-dpaa-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-dpaa-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc
deleted file mode 100644
index 4ae4cd8502..0000000000
--- a/config/defconfig_arm64-dpaa-linuxapp-gcc
+++ /dev/null
@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 Freescale Semiconductor, Inc.
-# Copyright 2017-2019 NXP
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-# NXP (Freescale) - Soc Architecture for DPAA or DPAA2 support
-# DPAA - FMAN, QMAN & BMAN support (e.g. LS1043, LS1046)
-# DPAA2 - WRIOP and QBMAN (e.g. LS1088, LS2088, LX2160 etc)
-#
-CONFIG_RTE_MACHINE="dpaa"
-CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72"
-
-#
-# Compile Environment Abstraction Layer
-#
-CONFIG_RTE_MAX_LCORE=16
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_CACHE_LINE_SIZE=64
-CONFIG_RTE_PKTMBUF_HEADROOM=128
-
-# Doesn't support NUMA
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-
-# Enable PHY mode when using VM-VFIO target
-CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n
-
-# NXP DPAA Bus
-CONFIG_RTE_LIBRTE_DPAA_DEBUG_DRIVER=n
-CONFIG_RTE_LIBRTE_DPAA_HWDEBUG=n
diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc
deleted file mode 120000
index 21894a31a8..0000000000
--- a/config/defconfig_arm64-emag-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-emag-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc
deleted file mode 100644
index 1db654c899..0000000000
--- a/config/defconfig_arm64-emag-linuxapp-gcc
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Ampere Computing
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="emag"
-
-CONFIG_RTE_CACHE_LINE_SIZE=64
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_MAX_LCORE=32
diff --git a/config/defconfig_arm64-n1sdp-linux-gcc b/config/defconfig_arm64-n1sdp-linux-gcc
deleted file mode 120000
index 103bbea90f..0000000000
--- a/config/defconfig_arm64-n1sdp-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-n1sdp-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-n1sdp-linuxapp-gcc b/config/defconfig_arm64-n1sdp-linuxapp-gcc
deleted file mode 100644
index f9138093b5..0000000000
--- a/config/defconfig_arm64-n1sdp-linuxapp-gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Arm Ltd.
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="n1sdp"
-CONFIG_RTE_MAX_LCORE=4
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_CACHE_LINE_SIZE=64
-
-# Doesn't support NUMA
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
diff --git a/config/defconfig_arm64-octeontx2-linux-gcc b/config/defconfig_arm64-octeontx2-linux-gcc
deleted file mode 120000
index e251505311..0000000000
--- a/config/defconfig_arm64-octeontx2-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-octeontx2-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc
deleted file mode 100644
index 0d83becf54..0000000000
--- a/config/defconfig_arm64-octeontx2-linuxapp-gcc
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="octeontx2"
-
-CONFIG_RTE_MAX_NUMA_NODES=1
-CONFIG_RTE_MAX_LCORE=36
-CONFIG_RTE_ARM_FEATURE_ATOMICS=y
-
-# Doesn't support NUMA
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-
-# Max supported NIX LFs
-CONFIG_RTE_MAX_VFIO_GROUPS=128
diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc
deleted file mode 120000
index 829dd65f05..0000000000
--- a/config/defconfig_arm64-stingray-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-stingray-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc
deleted file mode 100644
index 2a6f6cee28..0000000000
--- a/config/defconfig_arm64-stingray-linuxapp-gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) Broadcom 2017-2018. All rights reserved.
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-# Broadcom - Stingray
-CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72"
-
-# Doesn't support NUMA
-CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
-CONFIG_RTE_LIBRTE_VHOST_NUMA=n
-
-CONFIG_RTE_EAL_IGB_UIO=y
diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc
deleted file mode 120000
index 1b9c4ad211..0000000000
--- a/config/defconfig_arm64-thunderx-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-thunderx-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc
deleted file mode 100644
index 946906b67a..0000000000
--- a/config/defconfig_arm64-thunderx-linuxapp-gcc
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="thunderx"
-
-CONFIG_RTE_USE_C11_MEM_MODEL=n
-CONFIG_RTE_MAX_NUMA_NODES=2
-CONFIG_RTE_MAX_LCORE=96
-CONFIG_RTE_MAX_VFIO_GROUPS=128
-
-#
-# Compile PMD for octeontx sso event device
-#
-CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y
diff --git a/config/defconfig_arm64-thunderx2-linux-gcc b/config/defconfig_arm64-thunderx2-linux-gcc
deleted file mode 120000
index b40a760b1d..0000000000
--- a/config/defconfig_arm64-thunderx2-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-thunderx2-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc
deleted file mode 100644
index af4a89c480..0000000000
--- a/config/defconfig_arm64-thunderx2-linuxapp-gcc
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="thunderx2"
-
-CONFIG_RTE_CACHE_LINE_SIZE=64
-CONFIG_RTE_MAX_NUMA_NODES=2
-CONFIG_RTE_MAX_LCORE=256
-CONFIG_RTE_ARM_FEATURE_ATOMICS=y
diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc
deleted file mode 120000
index d5e8b5e550..0000000000
--- a/config/defconfig_arm64-xgene1-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_arm64-xgene1-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc
deleted file mode 100644
index fbf576c4aa..0000000000
--- a/config/defconfig_arm64-xgene1-linuxapp-gcc
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#include "defconfig_arm64-armv8a-linux-gcc"
-
-CONFIG_RTE_MACHINE="xgene1"
-CONFIG_RTE_CACHE_LINE_SIZE=64
diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc
deleted file mode 120000
index 927141d5dd..0000000000
--- a/config/defconfig_i686-native-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_i686-native-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc
deleted file mode 120000
index e6a466b3e3..0000000000
--- a/config/defconfig_i686-native-linux-icc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_i686-native-linuxapp-icc
\ No newline at end of file
diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
deleted file mode 100644
index 61ea1606f4..0000000000
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ /dev/null
@@ -1,66 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="i686"
-CONFIG_RTE_ARCH_I686=y
-CONFIG_RTE_ARCH_X86=y
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
-
-#
-# KNI is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_KNI=n
-
-#
-# Solarflare PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-
-#
-# AES-NI multi-buffer PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
-
-#
-# AES-NI GCM PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n
-
-#
-# KASUMI PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_KASUMI=n
-
-#
-# ZUC PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_ZUC=n
-
-#
-# AVP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-
-#
-# NFP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_NFP_PMD=n
-
-# 32-bit doesn't break up memory in lists, but does have VA allocation limit
-CONFIG_RTE_MAX_MEM_MB=2048
-
-#
-# HINIC PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-
-#
-# HNS3 PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
deleted file mode 100644
index 7f614d3467..0000000000
--- a/config/defconfig_i686-native-linuxapp-icc
+++ /dev/null
@@ -1,66 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="i686"
-CONFIG_RTE_ARCH_I686=y
-CONFIG_RTE_ARCH_X86=y
-
-CONFIG_RTE_TOOLCHAIN="icc"
-CONFIG_RTE_TOOLCHAIN_ICC=y
-
-#
-# KNI is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_KNI=n
-
-#
-# Solarflare PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-
-#
-# AES-NI multi-buffer PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
-
-#
-# AES-NI GCM PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n
-
-#
-# KASUMI PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_KASUMI=n
-
-#
-# ZUC PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_PMD_ZUC=n
-
-#
-# AVP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-
-#
-# NFP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_NFP_PMD=n
-
-# 32-bit doesn't break up memory in lists, but does have VA allocation limit
-CONFIG_RTE_MAX_MEM_MB=2048
-
-#
-# HINIC PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-
-#
-# HNS3 PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc
deleted file mode 120000
index 580c92e12e..0000000000
--- a/config/defconfig_ppc_64-power8-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_ppc_64-power8-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc
deleted file mode 100644
index c917c47746..0000000000
--- a/config/defconfig_ppc_64-power8-linuxapp-gcc
+++ /dev/null
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) IBM Corporation 2014.
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="power8"
-
-CONFIG_RTE_ARCH="ppc_64"
-CONFIG_RTE_ARCH_PPC_64=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_MAX_LCORE=1536
-CONFIG_RTE_MAX_NUMA_NODES=32
-CONFIG_RTE_CACHE_LINE_SIZE=128
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
-
-# Note: Power doesn't have this support
-CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n
-
-# Note: Initially, all of the PMD drivers compilation are turned off on Power
-# Will turn on them only after the successful testing on Power
-CONFIG_RTE_LIBRTE_ATLANTIC_PMD=n
-CONFIG_RTE_LIBRTE_IXGBE_PMD=n
-CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
-CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
-CONFIG_RTE_LIBRTE_ENIC_PMD=n
-CONFIG_RTE_LIBRTE_FM10K_PMD=n
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
-CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n
-CONFIG_RTE_LIBRTE_IONIC_PMD=n
diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang
deleted file mode 100644
index 7204738e14..0000000000
--- a/config/defconfig_x86_64-native-bsdapp-clang
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_freebsd"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_64"
-CONFIG_RTE_ARCH_X86_64=y
-CONFIG_RTE_ARCH_X86=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_TOOLCHAIN="clang"
-CONFIG_RTE_TOOLCHAIN_CLANG=y
diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
deleted file mode 100644
index b24e2e6d5a..0000000000
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_freebsd"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_64"
-CONFIG_RTE_ARCH_X86_64=y
-CONFIG_RTE_ARCH_X86=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang
deleted file mode 120000
index 76115fd5a6..0000000000
--- a/config/defconfig_x86_64-native-freebsd-clang
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_64-native-bsdapp-clang
\ No newline at end of file
diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc
deleted file mode 120000
index 72dd4b44be..0000000000
--- a/config/defconfig_x86_64-native-freebsd-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_64-native-bsdapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang
deleted file mode 120000
index 3bcf89d6a4..0000000000
--- a/config/defconfig_x86_64-native-linux-clang
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_64-native-linuxapp-clang
\ No newline at end of file
diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc
deleted file mode 120000
index d707965941..0000000000
--- a/config/defconfig_x86_64-native-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_64-native-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc
deleted file mode 120000
index a36b47131a..0000000000
--- a/config/defconfig_x86_64-native-linux-icc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_64-native-linuxapp-icc
\ No newline at end of file
diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang
deleted file mode 100644
index 7508c0f2da..0000000000
--- a/config/defconfig_x86_64-native-linuxapp-clang
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_64"
-CONFIG_RTE_ARCH_X86_64=y
-CONFIG_RTE_ARCH_X86=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_TOOLCHAIN="clang"
-CONFIG_RTE_TOOLCHAIN_CLANG=y
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
deleted file mode 100644
index db67066a57..0000000000
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_64"
-CONFIG_RTE_ARCH_X86_64=y
-CONFIG_RTE_ARCH_X86=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
deleted file mode 100644
index 8aa7af7e20..0000000000
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ /dev/null
@@ -1,29 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_64"
-CONFIG_RTE_ARCH_X86_64=y
-CONFIG_RTE_ARCH_X86=y
-CONFIG_RTE_ARCH_64=y
-
-CONFIG_RTE_TOOLCHAIN="icc"
-CONFIG_RTE_TOOLCHAIN_ICC=y
-
-#
-# Solarflare PMD build is not supported using icc toolchain
-#
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-
-#
-# HINIC PMD build is not supported using icc toolchain
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-
-#
-# HNS3 PMD build is not supported using icc toolchain
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc
deleted file mode 120000
index 7ea00cecb3..0000000000
--- a/config/defconfig_x86_x32-native-linux-gcc
+++ /dev/null
@@ -1 +0,0 @@
-defconfig_x86_x32-native-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc
deleted file mode 100644
index c188f4331c..0000000000
--- a/config/defconfig_x86_x32-native-linuxapp-gcc
+++ /dev/null
@@ -1,46 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#include "common_linux"
-
-CONFIG_RTE_MACHINE="native"
-
-CONFIG_RTE_ARCH="x86_x32"
-CONFIG_RTE_ARCH_X86_X32=y
-CONFIG_RTE_ARCH_X86=y
-
-CONFIG_RTE_TOOLCHAIN="gcc"
-CONFIG_RTE_TOOLCHAIN_GCC=y
-
-#
-# KNI is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_KNI=n
-
-#
-# Solarflare PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n
-
-#
-# AVP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_AVP_PMD=n
-
-#
-# NFP PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_NFP_PMD=n
-
-# 32-bit doesn't break up memory in lists, but does have VA allocation limit
-CONFIG_RTE_MAX_MEM_MB=2048
-
-#
-# HINIC PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HINIC_PMD=n
-
-#
-# HNS3 PMD is not supported on 32-bit
-#
-CONFIG_RTE_LIBRTE_HNS3_PMD=n
diff --git a/config/rte_config.h b/config/rte_config.h
index 9bb915347c..0bae630fd9 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -8,10 +8,6 @@
  * Header file containing DPDK compilation parameters. Also include the
  * meson-generated header file containing the detected parameters that
  * are variable across builds or build environments.
- *
- * NOTE: This file is only used for meson+ninja builds. For builds done
- * using make/gmake, the rte_config.h file is autogenerated from the
- * defconfig_* files in the config directory.
  */
 #ifndef _RTE_CONFIG_H_
 #define _RTE_CONFIG_H_
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 276fff647b..8fa01ad177 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -19,8 +19,8 @@ arm_64=true
 print_usage()
 {
 	echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]"
-	echo "Valid configs are:"
-	make showconfigs | sed 's,^,\t,'
+	echo "Examples of valid configs are: "
+	echo "x86_64-bsd, arm64-linux, ppc_64-linux"
 }
 
 # Move to the root of the git tree
@@ -125,18 +125,7 @@ ppc_64_sources()
 	find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
-check_valid_target()
-{
-	if [ ! -f "config/defconfig_$1" ] ; then
-		echo "Invalid config: $1"
-		print_usage
-		exit 0
-	fi
-}
-
 if [ -n "$2" ]; then
-	check_valid_target $2
-
 	echo $2 | grep -q "linux" || linux=false
 	echo $2 | grep -q "bsd" || bsd=false
 	echo $2 | grep -q "x86_64-" || x86_64=false
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 07e072e13f..c15ed3bade 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -34,7 +34,6 @@
  * This code tries to determine if the PCI device is bound to VFIO driver,
  * and initialize it (map BARs, set up interrupts) if that's the case.
  *
- * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y".
  */
 
 #ifdef VFIO_PRESENT
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index fe7f9200c1..60b33d20a1 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -3438,7 +3438,6 @@ i40e_set_default_pctype_table(struct rte_eth_dev *dev)
 }
 
 #ifndef RTE_LIBRTE_I40E_INC_VECTOR
-/* Stubs needed for linkage when CONFIG_RTE_LIBRTE_I40E_INC_VECTOR is set to 'n' */
 int
 i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
 {
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 9e0ee052b3..6ad7e31170 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -970,7 +970,7 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *);
  *   If cache_size is non-zero, the rte_mempool library will try to
  *   limit the accesses to the common lockless pool, by maintaining a
  *   per-lcore object cache. This argument must be lower or equal to
- *   CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose
+ *   RTE_MEMPOOL_CACHE_MAX_SIZE and n / 1.5. It is advised to choose
  *   cache_size to have "n modulo cache_size == 0": if this is
  *   not the case, some elements will always stay in the pool and will
  *   never be used. The access to the per-lcore table is of course
diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h
index 69dc51746c..938b398fc0 100644
--- a/lib/librte_ring/rte_ring_elem.h
+++ b/lib/librte_ring/rte_ring_elem.h
@@ -373,8 +373,7 @@ __rte_ring_dequeue_elems(struct rte_ring *r, uint32_t cons_head,
  * (powerpc/arm).
  * There are 2 choices for the users
  * 1.use rmb() memory barrier
- * 2.use one-direction load_acquire/store_release barrier,defined by
- * CONFIG_RTE_USE_C11_MEM_MODEL=y
+ * 2.use one-direction load_acquire/store_release barrier
  * It depends on performance test results.
  * By default, move common functions to rte_ring_generic.h
  */
