From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id DDB8FB0A4 for ; Wed, 14 May 2014 16:58:14 +0200 (CEST) Received: by mail-wg0-f51.google.com with SMTP id x13so2064165wgg.10 for ; Wed, 14 May 2014 07:58:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=swlbMzyzGyjhnRN5IYkhuUk5wj6N+zsp/KRt1zoACGY=; b=X5Ji/5KRyJB6dh2k1eVgUGcrMFkgVZ+JwE4cbXkxfgbmV3cxWhYGU1AkmZxBThyY0j +TK2M6Wnv7KlI/OT8q8YkrpPukeV3Q9Tx5CgqnyC5d7Jn6N3N+OqloFso+lgRqH3E+iN rYn28Fdgx+wKHZ+XiCkz2HEUxdgq5S+Q/PLL7CFuOpM/CGmMQ903U8Wc8Gtb6ngClHDa Hf9V5VUHGZoVKDpOFnsVmf2NxKjHZc8kfi/PDKfea0U3fXa+wD9cMdXImEYFxdaWaGR9 LjZsJd42kJlB+F/XNQYovwWfrTsHj/tPpEbeboMkC0qYDn1kaZHcpNYN1EtwSQY53SQT tpWA== X-Gm-Message-State: ALoCoQmWQUucbAq5n6vso2oWXv1QpcVDy7YObkSSzZw1irNm88zW8lzhH9RZ8CTY1UKee80MPkO8 X-Received: by 10.194.120.101 with SMTP id lb5mr2154512wjb.74.1400079502574; Wed, 14 May 2014 07:58:22 -0700 (PDT) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id q9sm2831740wjo.3.2014.05.14.07.58.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 May 2014 07:58:21 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Wed, 14 May 2014 16:58:08 +0200 Message-Id: <1400079489-13152-3-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400079489-13152-1-git-send-email-david.marchand@6wind.com> References: <1400079489-13152-1-git-send-email-david.marchand@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] =?utf-8?q?=5BPATCH_2/3=5D_config=3A_rename_=22default?= =?utf-8?q?=22_configuration_file_as_=22native=22?= X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 14:58:15 -0000 The "default" part in configuration filenames is misleading. Rename this as "native", as this is the RTE_MACHINE that is set in these files. This should make it clearer for people who build DPDK on a system then run it on another one. Signed-off-by: David Marchand --- config/defconfig_i686-default-linuxapp-gcc | 68 ------------------- config/defconfig_i686-default-linuxapp-icc | 68 ------------------- config/defconfig_i686-native-linuxapp-gcc | 68 +++++++++++++++++++ config/defconfig_i686-native-linuxapp-icc | 68 +++++++++++++++++++ config/defconfig_x86_64-default-bsdapp-gcc | 71 -------------------- config/defconfig_x86_64-default-linuxapp-gcc | 63 ----------------- config/defconfig_x86_64-default-linuxapp-icc | 63 ----------------- config/defconfig_x86_64-ivshmem-linuxapp-gcc | 2 +- config/defconfig_x86_64-ivshmem-linuxapp-icc | 2 +- config/defconfig_x86_64-native-bsdapp-gcc | 71 ++++++++++++++++++++ config/defconfig_x86_64-native-linuxapp-gcc | 63 +++++++++++++++++ config/defconfig_x86_64-native-linuxapp-icc | 63 +++++++++++++++++ doc/build-sdk-quick.txt | 2 +- examples/cmdline/Makefile | 2 +- examples/dpdk_qat/Makefile | 2 +- examples/exception_path/Makefile | 2 +- examples/helloworld/Makefile | 2 +- examples/ip_reassembly/Makefile | 2 +- examples/ipv4_frag/Makefile | 2 +- examples/ipv4_multicast/Makefile | 2 +- examples/kni/Makefile | 2 +- examples/l2fwd/Makefile | 2 +- examples/l3fwd-power/Makefile | 2 +- examples/l3fwd-vf/Makefile | 2 +- examples/l3fwd/Makefile | 2 +- examples/link_status_interrupt/Makefile | 2 +- examples/load_balancer/Makefile | 2 +- .../client_server_mp/mp_server/Makefile | 2 +- examples/multi_process/l2fwd_fork/Makefile | 2 +- examples/multi_process/simple_mp/Makefile | 2 +- examples/multi_process/symmetric_mp/Makefile | 2 +- examples/netmap_compat/bridge/Makefile | 2 +- examples/qos_meter/Makefile | 2 +- examples/qos_sched/Makefile | 2 +- examples/quota_watermark/Makefile | 2 +- examples/quota_watermark/qw/Makefile | 2 +- examples/quota_watermark/qwctl/Makefile | 2 +- examples/timer/Makefile | 2 +- examples/vhost/Makefile | 2 +- examples/vhost_xen/Makefile | 2 +- examples/vmdq/Makefile | 2 +- examples/vmdq_dcb/Makefile | 2 +- mk/rte.sdkinstall.mk | 2 +- mk/rte.sdkroot.mk | 2 +- mk/rte.sdktestall.mk | 2 +- pkg/dpdk-core.spec | 2 +- scripts/test-framework.sh | 2 +- 47 files changed, 370 insertions(+), 370 deletions(-) delete mode 100644 config/defconfig_i686-default-linuxapp-gcc delete mode 100644 config/defconfig_i686-default-linuxapp-icc create mode 100644 config/defconfig_i686-native-linuxapp-gcc create mode 100644 config/defconfig_i686-native-linuxapp-icc delete mode 100644 config/defconfig_x86_64-default-bsdapp-gcc delete mode 100644 config/defconfig_x86_64-default-linuxapp-gcc delete mode 100644 config/defconfig_x86_64-default-linuxapp-icc create mode 100644 config/defconfig_x86_64-native-bsdapp-gcc create mode 100644 config/defconfig_x86_64-native-linuxapp-gcc create mode 100644 config/defconfig_x86_64-native-linuxapp-icc diff --git a/config/defconfig_i686-default-linuxapp-gcc b/config/defconfig_i686-default-linuxapp-gcc deleted file mode 100644 index 8bb5c5a..0000000 --- a/config/defconfig_i686-default-linuxapp-gcc +++ /dev/null @@ -1,68 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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" - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE can be: -# default nothing specific -# native current machine -# atm Intel® Atom™ microarchitecture -# nhm Intel® microarchitecture code name Nehalem -# wsm Intel® microarchitecture code name Westmere -# snb Intel® microarchitecture code name Sandy Bridge -# ivb Intel® microarchitecture code name Ivy Bridge -# -# Note: if your compiler does not support the relevant -march options, -# it will be compiled with whatever latest processor the compiler supports! -# -CONFIG_RTE_MACHINE="native" - -# -# define the architecture we compile for. -# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 -# -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y - -# -# The compiler we use. -# Can be gcc or icc. -# -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n diff --git a/config/defconfig_i686-default-linuxapp-icc b/config/defconfig_i686-default-linuxapp-icc deleted file mode 100644 index e030246..0000000 --- a/config/defconfig_i686-default-linuxapp-icc +++ /dev/null @@ -1,68 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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" - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE can be: -# default nothing specific -# native current machine -# atm Intel® Atom™ microarchitecture -# nhm Intel® microarchitecture code name Nehalem -# wsm Intel® microarchitecture code name Westmere -# snb Intel® microarchitecture code name Sandy Bridge -# ivb Intel® microarchitecture code name Ivy Bridge -# -# Note: if your compiler does not support the relevant -march options, -# it will be compiled with whatever latest processor the compiler supports! -# -CONFIG_RTE_MACHINE="native" - -# -# define the architecture we compile for. -# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 -# -CONFIG_RTE_ARCH="i686" -CONFIG_RTE_ARCH_I686=y - -# -# The compiler we use. -# Can be gcc or icc. -# -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y - -# -# KNI is not supported on 32-bit -# -CONFIG_RTE_LIBRTE_KNI=n diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc new file mode 100644 index 0000000..8bb5c5a --- /dev/null +++ b/config/defconfig_i686-native-linuxapp-gcc @@ -0,0 +1,68 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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" + +# +# machine can define specific variables or action for a specific board +# RTE_MACHINE can be: +# default nothing specific +# native current machine +# atm Intel® Atom™ microarchitecture +# nhm Intel® microarchitecture code name Nehalem +# wsm Intel® microarchitecture code name Westmere +# snb Intel® microarchitecture code name Sandy Bridge +# ivb Intel® microarchitecture code name Ivy Bridge +# +# Note: if your compiler does not support the relevant -march options, +# it will be compiled with whatever latest processor the compiler supports! +# +CONFIG_RTE_MACHINE="native" + +# +# define the architecture we compile for. +# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +# +CONFIG_RTE_ARCH="i686" +CONFIG_RTE_ARCH_I686=y + +# +# The compiler we use. +# Can be gcc or icc. +# +CONFIG_RTE_TOOLCHAIN="gcc" +CONFIG_RTE_TOOLCHAIN_GCC=y + +# +# KNI is not supported on 32-bit +# +CONFIG_RTE_LIBRTE_KNI=n diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc new file mode 100644 index 0000000..e030246 --- /dev/null +++ b/config/defconfig_i686-native-linuxapp-icc @@ -0,0 +1,68 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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" + +# +# machine can define specific variables or action for a specific board +# RTE_MACHINE can be: +# default nothing specific +# native current machine +# atm Intel® Atom™ microarchitecture +# nhm Intel® microarchitecture code name Nehalem +# wsm Intel® microarchitecture code name Westmere +# snb Intel® microarchitecture code name Sandy Bridge +# ivb Intel® microarchitecture code name Ivy Bridge +# +# Note: if your compiler does not support the relevant -march options, +# it will be compiled with whatever latest processor the compiler supports! +# +CONFIG_RTE_MACHINE="native" + +# +# define the architecture we compile for. +# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +# +CONFIG_RTE_ARCH="i686" +CONFIG_RTE_ARCH_I686=y + +# +# The compiler we use. +# Can be gcc or icc. +# +CONFIG_RTE_TOOLCHAIN="icc" +CONFIG_RTE_TOOLCHAIN_ICC=y + +# +# KNI is not supported on 32-bit +# +CONFIG_RTE_LIBRTE_KNI=n diff --git a/config/defconfig_x86_64-default-bsdapp-gcc b/config/defconfig_x86_64-default-bsdapp-gcc deleted file mode 100644 index b131dea..0000000 --- a/config/defconfig_x86_64-default-bsdapp-gcc +++ /dev/null @@ -1,71 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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_bsdapp" - -# -# define executive environment -# -# CONFIG_RTE_EXEC_ENV can be linuxapp, baremetal, bsdapp -# -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE can be: -# default nothing specific -# native current machine -# atm Intel® Atom™ microarchitecture -# nhm Intel® microarchitecture code name Nehalem -# wsm Intel® microarchitecture code name Westmere -# snb Intel® microarchitecture code name Sandy Bridge -# ivb Intel® microarchitecture code name Ivy Bridge -# -# Note: if your compiler does not support the relevant -march options, -# it will be compiled with whatever latest processor the compiler supports! -# -CONFIG_RTE_MACHINE="native" - -# -# define the architecture we compile for. -# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 -# -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y - -# -# The compiler we use. -# Can be gcc or icc. -# -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-default-linuxapp-gcc b/config/defconfig_x86_64-default-linuxapp-gcc deleted file mode 100644 index 2a4ce89..0000000 --- a/config/defconfig_x86_64-default-linuxapp-gcc +++ /dev/null @@ -1,63 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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" - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE can be: -# default nothing specific -# native current machine -# atm Intel® Atom™ microarchitecture -# nhm Intel® microarchitecture code name Nehalem -# wsm Intel® microarchitecture code name Westmere -# snb Intel® microarchitecture code name Sandy Bridge -# ivb Intel® microarchitecture code name Ivy Bridge -# -# Note: if your compiler does not support the relevant -march options, -# it will be compiled with whatever latest processor the compiler supports! -# -CONFIG_RTE_MACHINE="native" - -# -# define the architecture we compile for. -# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 -# -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y - -# -# The compiler we use. -# Can be gcc or icc. -# -CONFIG_RTE_TOOLCHAIN="gcc" -CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-default-linuxapp-icc b/config/defconfig_x86_64-default-linuxapp-icc deleted file mode 100644 index b2774e1..0000000 --- a/config/defconfig_x86_64-default-linuxapp-icc +++ /dev/null @@ -1,63 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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" - -# -# machine can define specific variables or action for a specific board -# RTE_MACHINE can be: -# default nothing specific -# native current machine -# atm Intel® Atom™ microarchitecture -# nhm Intel® microarchitecture code name Nehalem -# wsm Intel® microarchitecture code name Westmere -# snb Intel® microarchitecture code name Sandy Bridge -# ivb Intel® microarchitecture code name Ivy Bridge -# -# Note: if your compiler does not support the relevant -march options, -# it will be compiled with whatever latest processor the compiler supports! -# -CONFIG_RTE_MACHINE="native" - -# -# define the architecture we compile for. -# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 -# -CONFIG_RTE_ARCH="x86_64" -CONFIG_RTE_ARCH_X86_64=y - -# -# The compiler we use. -# Can be gcc or icc. -# -CONFIG_RTE_TOOLCHAIN="icc" -CONFIG_RTE_TOOLCHAIN_ICC=y diff --git a/config/defconfig_x86_64-ivshmem-linuxapp-gcc b/config/defconfig_x86_64-ivshmem-linuxapp-gcc index 2f55a69..d53b8a4 100644 --- a/config/defconfig_x86_64-ivshmem-linuxapp-gcc +++ b/config/defconfig_x86_64-ivshmem-linuxapp-gcc @@ -34,7 +34,7 @@ # use default config # -#include "defconfig_x86_64-default-linuxapp-gcc" +#include "defconfig_x86_64-native-linuxapp-gcc" # # Compile IVSHMEM library diff --git a/config/defconfig_x86_64-ivshmem-linuxapp-icc b/config/defconfig_x86_64-ivshmem-linuxapp-icc index 14f0926..3845313 100644 --- a/config/defconfig_x86_64-ivshmem-linuxapp-icc +++ b/config/defconfig_x86_64-ivshmem-linuxapp-icc @@ -34,7 +34,7 @@ # use default config # -#include "defconfig_x86_64-default-linuxapp-icc" +#include "defconfig_x86_64-native-linuxapp-icc" # # Compile IVSHMEM library diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc new file mode 100644 index 0000000..b131dea --- /dev/null +++ b/config/defconfig_x86_64-native-bsdapp-gcc @@ -0,0 +1,71 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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_bsdapp" + +# +# define executive environment +# +# CONFIG_RTE_EXEC_ENV can be linuxapp, baremetal, bsdapp +# +CONFIG_RTE_EXEC_ENV="bsdapp" +CONFIG_RTE_EXEC_ENV_BSDAPP=y + +# +# machine can define specific variables or action for a specific board +# RTE_MACHINE can be: +# default nothing specific +# native current machine +# atm Intel® Atom™ microarchitecture +# nhm Intel® microarchitecture code name Nehalem +# wsm Intel® microarchitecture code name Westmere +# snb Intel® microarchitecture code name Sandy Bridge +# ivb Intel® microarchitecture code name Ivy Bridge +# +# Note: if your compiler does not support the relevant -march options, +# it will be compiled with whatever latest processor the compiler supports! +# +CONFIG_RTE_MACHINE="native" + +# +# define the architecture we compile for. +# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +# +CONFIG_RTE_ARCH="x86_64" +CONFIG_RTE_ARCH_X86_64=y + +# +# The compiler we use. +# Can be gcc or icc. +# +CONFIG_RTE_TOOLCHAIN="gcc" +CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc new file mode 100644 index 0000000..2a4ce89 --- /dev/null +++ b/config/defconfig_x86_64-native-linuxapp-gcc @@ -0,0 +1,63 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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" + +# +# machine can define specific variables or action for a specific board +# RTE_MACHINE can be: +# default nothing specific +# native current machine +# atm Intel® Atom™ microarchitecture +# nhm Intel® microarchitecture code name Nehalem +# wsm Intel® microarchitecture code name Westmere +# snb Intel® microarchitecture code name Sandy Bridge +# ivb Intel® microarchitecture code name Ivy Bridge +# +# Note: if your compiler does not support the relevant -march options, +# it will be compiled with whatever latest processor the compiler supports! +# +CONFIG_RTE_MACHINE="native" + +# +# define the architecture we compile for. +# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +# +CONFIG_RTE_ARCH="x86_64" +CONFIG_RTE_ARCH_X86_64=y + +# +# The compiler we use. +# Can be gcc or icc. +# +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 new file mode 100644 index 0000000..b2774e1 --- /dev/null +++ b/config/defconfig_x86_64-native-linuxapp-icc @@ -0,0 +1,63 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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" + +# +# machine can define specific variables or action for a specific board +# RTE_MACHINE can be: +# default nothing specific +# native current machine +# atm Intel® Atom™ microarchitecture +# nhm Intel® microarchitecture code name Nehalem +# wsm Intel® microarchitecture code name Westmere +# snb Intel® microarchitecture code name Sandy Bridge +# ivb Intel® microarchitecture code name Ivy Bridge +# +# Note: if your compiler does not support the relevant -march options, +# it will be compiled with whatever latest processor the compiler supports! +# +CONFIG_RTE_MACHINE="native" + +# +# define the architecture we compile for. +# CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +# +CONFIG_RTE_ARCH="x86_64" +CONFIG_RTE_ARCH_X86_64=y + +# +# The compiler we use. +# Can be gcc or icc. +# +CONFIG_RTE_TOOLCHAIN="icc" +CONFIG_RTE_TOOLCHAIN_ICC=y diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index 8989a32..84947cf 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -1,5 +1,5 @@ Basic build - make config T=x86_64-default-linuxapp-gcc && make + make config T=x86_64-native-linuxapp-gcc && make Build commands config get configuration from target template (T=) all same as build (default rule) diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 8412131..1033967 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile index d94b41a..4dd12b5 100644 --- a/examples/dpdk_qat/Makefile +++ b/examples/dpdk_qat/Makefile @@ -38,7 +38,7 @@ $(error "Please define ICP_ROOT environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index de99538..3959130 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 05e81e6..b215a00 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 5a645da..3115b95 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -35,7 +35,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ipv4_frag/Makefile b/examples/ipv4_frag/Makefile index 97fa452..5fc4d9e 100644 --- a/examples/ipv4_frag/Makefile +++ b/examples/ipv4_frag/Makefile @@ -35,7 +35,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index f76f8d8..f2ec731 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -35,7 +35,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 2c8aea3..de10088 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index e0ba282..06dff0d 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 5cc8ede..cd00cba 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index 1ecf5b0..974d6b7 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index 5811f60..3824a89 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index d69e8a8..d3b8c17 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile index 4fe0625..c532e8b 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index a8e9e47..31b03d5 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/l2fwd_fork/Makefile b/examples/multi_process/l2fwd_fork/Makefile index b7e0b45..18e56dd 100644 --- a/examples/multi_process/l2fwd_fork/Makefile +++ b/examples/multi_process/l2fwd_fork/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index 0273dec..136dbfa 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index c15212b..d21aa7d 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile index 74feb1e..ae6447f 100644 --- a/examples/netmap_compat/bridge/Makefile +++ b/examples/netmap_compat/bridge/Makefile @@ -34,7 +34,7 @@ $(error "Please define the RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 6dc7ad6..43c9720 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index b91fe37..d16ca53 100755 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile index 5596dcc..ba031c3 100644 --- a/examples/quota_watermark/Makefile +++ b/examples/quota_watermark/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK diff --git a/examples/quota_watermark/qw/Makefile b/examples/quota_watermark/qw/Makefile index b8f9a4c..3ec7df2 100644 --- a/examples/quota_watermark/qw/Makefile +++ b/examples/quota_watermark/qw/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/quota_watermark/qwctl/Makefile b/examples/quota_watermark/qwctl/Makefile index f82fca0..b3ba6ee 100644 --- a/examples/quota_watermark/qwctl/Makefile +++ b/examples/quota_watermark/qwctl/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/timer/Makefile b/examples/timer/Makefile index a731d80..30f7192 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index e56b184..83b173b 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vhost_xen/Makefile b/examples/vhost_xen/Makefile index cfc4cc6..c0cd22e 100644 --- a/examples/vhost_xen/Makefile +++ b/examples/vhost_xen/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index ac8230d..b638d42 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 2374f72..a0868bf 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -34,7 +34,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriden by command line or environment -RTE_TARGET ?= x86_64-default-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 61a8771..24b60cf 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -38,7 +38,7 @@ endif # Targets to install can be specified in command line. It can be a # target name or a name containing jokers "*". Example: -# x86_64-default-*-gcc +# x86_64-native-*-gcc ifndef T T=* endif diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 28e404b..c0259f5 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -53,7 +53,7 @@ export BUILDING_RTE_SDK # # We can specify the configuration template when doing the "make -# config". For instance: make config T=i686-default-baremetal-gcc +# config". For instance: make config T=i686-native-baremetal-gcc # RTE_CONFIG_TEMPLATE := ifdef T diff --git a/mk/rte.sdktestall.mk b/mk/rte.sdktestall.mk index 5ea6573..c88012e 100644 --- a/mk/rte.sdktestall.mk +++ b/mk/rte.sdktestall.mk @@ -37,7 +37,7 @@ endif # Targets to test can be specified in command line. It can be a # target name or a name containing jokers "*". Example: -# x86_64-default-*-gcc +# x86_64-native-*-gcc ifndef T T=* endif diff --git a/pkg/dpdk-core.spec b/pkg/dpdk-core.spec index f1387f9..8c0e040 100644 --- a/pkg/dpdk-core.spec +++ b/pkg/dpdk-core.spec @@ -43,7 +43,7 @@ Group: System Environment/Libraries License: BSD and LGPLv2 and GPLv2 ExclusiveArch: i686, x86_64 -%define target %{_arch}-default-linuxapp-gcc +%define target %{_arch}-native-linuxapp-gcc %define machine default BuildRequires: kernel-devel, kernel-headers, doxygen diff --git a/scripts/test-framework.sh b/scripts/test-framework.sh index 378b21a..56179c6 100755 --- a/scripts/test-framework.sh +++ b/scripts/test-framework.sh @@ -35,7 +35,7 @@ # must be executed from root # do a first build -make config T=x86_64-default-linuxapp-gcc O=deptest +make config T=x86_64-native-linuxapp-gcc O=deptest make -j8 O=deptest MOD_APP_TEST1=`stat deptest/app/test | grep Modify` -- 1.7.10.4