summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-06 16:22:42 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-12 23:05:06 +0100
commit218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf (patch)
tree00b4b284261f43298e1ecf4249980bda614f4b20 /config
parentae2f2fee247ad0f80f5a122fd174fa16cddd5438 (diff)
downloaddpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.zip
dpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.tar.gz
dpdk-next-eventdev-218c4e68c1d9bd4a9281bc1dc4d0ab89859083bf.tar.xz
mk: use linux and freebsd in config names
Rather than using linuxapp and bsdapp everywhere, we can change things to use the, more readable, terms "linux" and "freebsd" in our build configs. Rather than renaming the configs we can just duplicate the existing ones with the new names using symlinks, and use the new names exclusively internally. ["make showconfigs" also only shows the new names to keep the list short] The result is that backward compatibility is kept fully but any new builds or development can be done using the newer names, i.e. both "make config T=x86_64-native-linuxapp-gcc" and "T=x86_64-native-linux-gcc" work. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'config')
-rw-r--r--config/common_armv8a_linux (renamed from config/common_armv8a_linuxapp)2
-rw-r--r--config/common_freebsd (renamed from config/common_bsdapp)0
-rw-r--r--config/common_linux (renamed from config/common_linuxapp)0
l---------config/defconfig_arm-armv7a-linux-gcc1
-rw-r--r--config/defconfig_arm-armv7a-linuxapp-gcc2
l---------config/defconfig_arm64-armv8a-linux-clang1
l---------config/defconfig_arm64-armv8a-linux-gcc1
-rw-r--r--config/defconfig_arm64-armv8a-linuxapp-clang2
-rw-r--r--config/defconfig_arm64-armv8a-linuxapp-gcc2
l---------config/defconfig_arm64-bluefield-linux-gcc1
-rw-r--r--config/defconfig_arm64-bluefield-linuxapp-gcc2
l---------config/defconfig_arm64-dpaa-linux-gcc1
-rw-r--r--config/defconfig_arm64-dpaa-linuxapp-gcc2
l---------config/defconfig_arm64-dpaa2-linux-gcc1
-rw-r--r--config/defconfig_arm64-dpaa2-linuxapp-gcc2
l---------config/defconfig_arm64-stingray-linux-gcc1
-rw-r--r--config/defconfig_arm64-stingray-linuxapp-gcc2
l---------config/defconfig_arm64-thunderx-linux-gcc1
-rw-r--r--config/defconfig_arm64-thunderx-linuxapp-gcc2
l---------config/defconfig_arm64-xgene1-linux-gcc1
-rw-r--r--config/defconfig_arm64-xgene1-linuxapp-gcc2
l---------config/defconfig_i686-native-linux-gcc1
l---------config/defconfig_i686-native-linux-icc1
-rw-r--r--config/defconfig_i686-native-linuxapp-gcc2
-rw-r--r--config/defconfig_i686-native-linuxapp-icc2
l---------config/defconfig_ppc_64-power8-linux-gcc1
-rw-r--r--config/defconfig_ppc_64-power8-linuxapp-gcc2
-rw-r--r--config/defconfig_x86_64-native-bsdapp-clang2
-rw-r--r--config/defconfig_x86_64-native-bsdapp-gcc2
l---------config/defconfig_x86_64-native-freebsd-clang1
l---------config/defconfig_x86_64-native-freebsd-gcc1
l---------config/defconfig_x86_64-native-linux-clang1
l---------config/defconfig_x86_64-native-linux-gcc1
l---------config/defconfig_x86_64-native-linux-icc1
-rw-r--r--config/defconfig_x86_64-native-linuxapp-clang2
-rw-r--r--config/defconfig_x86_64-native-linuxapp-gcc2
-rw-r--r--config/defconfig_x86_64-native-linuxapp-icc2
l---------config/defconfig_x86_x32-native-linux-gcc1
-rw-r--r--config/defconfig_x86_x32-native-linuxapp-gcc2
39 files changed, 37 insertions, 19 deletions
diff --git a/config/common_armv8a_linuxapp b/config/common_armv8a_linux
index ad88a37..72091de 100644
--- a/config/common_armv8a_linuxapp
+++ b/config/common_armv8a_linux
@@ -2,7 +2,7 @@
# Copyright(c) 2017 Cavium, Inc
#
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="armv8a"
diff --git a/config/common_bsdapp b/config/common_freebsd
index 456b394..456b394 100644
--- a/config/common_bsdapp
+++ b/config/common_freebsd
diff --git a/config/common_linuxapp b/config/common_linux
index 7533427..7533427 100644
--- a/config/common_linuxapp
+++ b/config/common_linux
diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc
new file mode 120000
index 0000000..84619de
--- /dev/null
+++ b/config/defconfig_arm-armv7a-linux-gcc
@@ -0,0 +1 @@
+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
index 63f3a50..c9509b2 100644
--- a/config/defconfig_arm-armv7a-linuxapp-gcc
+++ b/config/defconfig_arm-armv7a-linuxapp-gcc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright (C) 2015 RehiveTech. All right reserved.
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="armv7a"
diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang
new file mode 120000
index 0000000..196808b
--- /dev/null
+++ b/config/defconfig_arm64-armv8a-linux-clang
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..0949519
--- /dev/null
+++ b/config/defconfig_arm64-armv8a-linux-gcc
@@ -0,0 +1 @@
+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
index 487714e..d3b4dad 100644
--- a/config/defconfig_arm64-armv8a-linuxapp-clang
+++ b/config/defconfig_arm64-armv8a-linuxapp-clang
@@ -2,7 +2,7 @@
# Copyright(c) 2017 Cavium, Inc
#
-#include "common_armv8a_linuxapp"
+#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
index a6ed90c..58c4a40 100644
--- a/config/defconfig_arm64-armv8a-linuxapp-gcc
+++ b/config/defconfig_arm64-armv8a-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright(c) 2015 Cavium, Inc
#
-#include "common_armv8a_linuxapp"
+#include "common_armv8a_linux"
CONFIG_RTE_TOOLCHAIN="gcc"
CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc
new file mode 120000
index 0000000..dad37d5
--- /dev/null
+++ b/config/defconfig_arm64-bluefield-linux-gcc
@@ -0,0 +1 @@
+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
index dd252c0..b496538 100644
--- a/config/defconfig_arm64-bluefield-linuxapp-gcc
+++ b/config/defconfig_arm64-bluefield-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright 2019 Mellanox Technologies, Ltd
#
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#include "defconfig_arm64-armv8a-linux-gcc"
# Mellanox BlueField
CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72"
diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc
new file mode 120000
index 0000000..dc05caa
--- /dev/null
+++ b/config/defconfig_arm64-dpaa-linux-gcc
@@ -0,0 +1 @@
+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
index 544b677..b408d4f 100644
--- a/config/defconfig_arm64-dpaa-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright 2016 Freescale Semiconductor, Inc.
# Copyright 2017 NXP
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#include "defconfig_arm64-armv8a-linux-gcc"
# NXP (Freescale) - Soc Architecture with FMAN, QMAN & BMAN support
CONFIG_RTE_MACHINE="dpaa"
diff --git a/config/defconfig_arm64-dpaa2-linux-gcc b/config/defconfig_arm64-dpaa2-linux-gcc
new file mode 120000
index 0000000..9a6c6c4
--- /dev/null
+++ b/config/defconfig_arm64-dpaa2-linux-gcc
@@ -0,0 +1 @@
+defconfig_arm64-dpaa2-linuxapp-gcc \ No newline at end of file
diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc
index 96f478a..8b545f5 100644
--- a/config/defconfig_arm64-dpaa2-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc
@@ -3,7 +3,7 @@
# Copyright 2016 NXP
#
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#include "defconfig_arm64-armv8a-linux-gcc"
# NXP (Freescale) - Soc Architecture with WRIOP and QBMAN support
CONFIG_RTE_MACHINE="dpaa2"
diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc
new file mode 120000
index 0000000..829dd65
--- /dev/null
+++ b/config/defconfig_arm64-stingray-linux-gcc
@@ -0,0 +1 @@
+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
index 9992507..7b33aa7 100644
--- a/config/defconfig_arm64-stingray-linuxapp-gcc
+++ b/config/defconfig_arm64-stingray-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright (C) Broadcom 2017-2018. All rights reserved.
#
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#include "defconfig_arm64-armv8a-linux-gcc"
# Broadcom - Stingray
CONFIG_RTE_MACHINE="armv8a"
diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc
new file mode 120000
index 0000000..1b9c4ad
--- /dev/null
+++ b/config/defconfig_arm64-thunderx-linux-gcc
@@ -0,0 +1 @@
+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
index fd160aa..a52f066 100644
--- a/config/defconfig_arm64-thunderx-linuxapp-gcc
+++ b/config/defconfig_arm64-thunderx-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright(c) 2015 Cavium, Inc
#
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#include "defconfig_arm64-armv8a-linux-gcc"
CONFIG_RTE_MACHINE="thunderx"
diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc
new file mode 120000
index 0000000..d5e8b5e
--- /dev/null
+++ b/config/defconfig_arm64-xgene1-linux-gcc
@@ -0,0 +1 @@
+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
index a2dd465..fbf576c 100644
--- a/config/defconfig_arm64-xgene1-linuxapp-gcc
+++ b/config/defconfig_arm64-xgene1-linuxapp-gcc
@@ -2,7 +2,7 @@
# Copyright(c) 2015 Cavium, Inc
#
-#include "defconfig_arm64-armv8a-linuxapp-gcc"
+#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
new file mode 120000
index 0000000..927141d
--- /dev/null
+++ b/config/defconfig_i686-native-linux-gcc
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..e6a466b
--- /dev/null
+++ b/config/defconfig_i686-native-linux-icc
@@ -0,0 +1 @@
+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
index 9b70868..0340c84 100644
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
index 17defd8..34a55fd 100644
--- a/config/defconfig_i686-native-linuxapp-icc
+++ b/config/defconfig_i686-native-linuxapp-icc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc
new file mode 120000
index 0000000..580c92e
--- /dev/null
+++ b/config/defconfig_ppc_64-power8-linux-gcc
@@ -0,0 +1 @@
+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
index 8cbf7ed..7e248b7 100644
--- a/config/defconfig_ppc_64-power8-linuxapp-gcc
+++ b/config/defconfig_ppc_64-power8-linuxapp-gcc
@@ -28,7 +28,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="power8"
diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang
index 8d2d10b..7204738 100644
--- a/config/defconfig_x86_64-native-bsdapp-clang
+++ b/config/defconfig_x86_64-native-bsdapp-clang
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_bsdapp"
+#include "common_freebsd"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
index 174a74b..b24e2e6 100644
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ b/config/defconfig_x86_64-native-bsdapp-gcc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_bsdapp"
+#include "common_freebsd"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang
new file mode 120000
index 0000000..76115fd
--- /dev/null
+++ b/config/defconfig_x86_64-native-freebsd-clang
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..72dd4b4
--- /dev/null
+++ b/config/defconfig_x86_64-native-freebsd-gcc
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..3bcf89d
--- /dev/null
+++ b/config/defconfig_x86_64-native-linux-clang
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..d707965
--- /dev/null
+++ b/config/defconfig_x86_64-native-linux-gcc
@@ -0,0 +1 @@
+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
new file mode 120000
index 0000000..a36b471
--- /dev/null
+++ b/config/defconfig_x86_64-native-linux-icc
@@ -0,0 +1 @@
+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
index 52d0d22..7508c0f 100644
--- a/config/defconfig_x86_64-native-linuxapp-clang
+++ b/config/defconfig_x86_64-native-linuxapp-clang
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index afa5d47..db67066 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
index 5978311..d3ecae4 100644
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ b/config/defconfig_x86_64-native-linuxapp-icc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"
diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc
new file mode 120000
index 0000000..7ea00ce
--- /dev/null
+++ b/config/defconfig_x86_x32-native-linux-gcc
@@ -0,0 +1 @@
+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
index 2c8419f..14445ab 100644
--- a/config/defconfig_x86_x32-native-linuxapp-gcc
+++ b/config/defconfig_x86_x32-native-linuxapp-gcc
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2010-2014 Intel Corporation
-#include "common_linuxapp"
+#include "common_linux"
CONFIG_RTE_MACHINE="native"