diff options
author | Luca Boccassi <luca.boccassi@gmail.com> | 2018-03-07 11:25:34 +0000 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-03-07 11:25:37 +0000 |
commit | 5a20dffc01e9483dfe8d901d734dc40cd8a0d6c5 (patch) | |
tree | b35070c2321ef0ef5a2e446484818cc88e1b4957 /config | |
parent | 5b3db0f8f1ad5ba2152d977ccd3825ea05e863a2 (diff) | |
parent | c3f15def2ebe9cc255cf0e5cf32aa171f5b4326d (diff) |
Merge tag 'upstream/17.11.1' into 17.11.x
Upstream version 17.11.1
Change-Id: Ic4947a43032110f3070932a25db1d80b7abf6705
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'config')
-rw-r--r-- | config/common_base | 7 | ||||
-rw-r--r-- | config/common_linuxapp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/common_base b/config/common_base index e74febef..214d9a27 100644 --- a/config/common_base +++ b/config/common_base @@ -230,7 +230,6 @@ CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y # CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MLX4_DEBUG=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS=n CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 # @@ -415,7 +414,6 @@ CONFIG_RTE_LIBRTE_QEDE_DEBUG_INFO=n CONFIG_RTE_LIBRTE_QEDE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n -CONFIG_RTE_LIBRTE_QEDE_VF_TX_SWITCH=y #Provides abs path/name of the firmware file. #Empty string denotes driver will use default firmware CONFIG_RTE_LIBRTE_QEDE_FW="" @@ -805,6 +803,11 @@ 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 diff --git a/config/common_linuxapp b/config/common_linuxapp index 74c7d64e..15c69616 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -50,3 +50,4 @@ CONFIG_RTE_LIBRTE_AVP_PMD=y CONFIG_RTE_LIBRTE_NFP_PMD=y CONFIG_RTE_LIBRTE_POWER=y CONFIG_RTE_VIRTIO_USER=y +CONFIG_RTE_PROC_INFO=y |