From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <david.marchand@6wind.com>
Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48])
by dpdk.org (Postfix) with ESMTP id 97F56AFD7
for <dev@dpdk.org>; Wed, 14 May 2014 16:58:16 +0200 (CEST)
Received: by mail-wg0-f48.google.com with SMTP id b13so2066562wgh.19
for <dev@dpdk.org>; Wed, 14 May 2014 07:58:24 -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=SeLLeNgESTT0Gcun0cq22wcMiMuTERZZtRBV+ZxrALE=;
b=hyYxypDpec9uOI5j+pbRpyt3/1mUlTuJA5C20tt/bKaVW71+ursbU8ZPmDKVORaHmM
Ym8QOq35WoQimCU0YDJtTPepk/POm1Of3lqwap2PAEMmNPyDCJXyp/nIuQYksrcn+yVn
mUbiVp5Z/tra3uIGas8K6Q2rDd2GZclrsHuD6klvrpVha9l+W53KfKQrJHrrwGiGrc+l
cymqp8ssEn9856wvRQKIyb9ZWCJOrbXCnbl7bz2x437iC3DCEmMlr6eMFVj00q0efElF
ApeChQKhyr9kv2z3WTnW6Yxv7O2hTwr3Y0pUXB5rTqkGiXWp8EW6Pr/O/0jVe3JhHI5O
6ubA==
X-Gm-Message-State: ALoCoQkXtiFwrH3y8GTi0K2FSWfFvlrnY45Y8wOJJCAjSzrxa2lqZUHSc3ceSTMFT4ytAab3p6/K
X-Received: by 10.180.74.78 with SMTP id r14mr3975788wiv.2.1400079504325;
Wed, 14 May 2014 07:58:24 -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.22
for <dev@dpdk.org>
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Wed, 14 May 2014 07:58:23 -0700 (PDT)
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Date: Wed, 14 May 2014 16:58:09 +0200
Message-Id: <1400079489-13152-4-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_3/3=5D_config=3A_rename_=22default?=
=?utf-8?q?=22_machine_type_as_=22core2=22?=
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 14 May 2014 14:58:17 -0000
"default" machine type refers to core2 -march, so rename the machine directory
to avoid misunderstanding it.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
config/common_bsdapp | 2 +-
config/common_linuxapp | 2 +-
config/defconfig_i686-native-linuxapp-gcc | 2 +-
config/defconfig_i686-native-linuxapp-icc | 2 +-
config/defconfig_x86_64-native-bsdapp-gcc | 2 +-
config/defconfig_x86_64-native-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-linuxapp-icc | 2 +-
mk/machine/core2/rte.vars.mk | 58 +++++++++++++++++++++++++++
mk/machine/default/rte.vars.mk | 58 ---------------------------
mk/target/generic/rte.vars.mk | 2 +-
pkg/dpdk-core.spec | 2 +-
11 files changed, 67 insertions(+), 67 deletions(-)
create mode 100644 mk/machine/core2/rte.vars.mk
delete mode 100644 mk/machine/default/rte.vars.mk
diff --git a/config/common_bsdapp b/config/common_bsdapp
index 2cc7b80..b0906c3 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -41,7 +41,7 @@ CONFIG_RTE_EXEC_ENV_BSDAPP=y
##
## machine can define specific variables or action for a specific board
## RTE_MACHINE can be:
-## default nothing specific
+## core2 nothing specific
## native current machine
## atm Intel® Atom™ microarchitecture
## nhm Intel® microarchitecture code name Nehalem
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 62619c6..e1d1a91 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -41,7 +41,7 @@ CONFIG_RTE_EXEC_ENV_LINUXAPP=y
##
## machine can define specific variables or action for a specific board
## RTE_MACHINE can be:
-## default nothing specific
+## core2 nothing specific
## native current machine
## atm Intel® Atom™ microarchitecture
## nhm Intel® microarchitecture code name Nehalem
diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
index 8bb5c5a..95cf091 100644
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -35,7 +35,7 @@
#
# machine can define specific variables or action for a specific board
# RTE_MACHINE can be:
-# default nothing specific
+# core2 nothing specific
# native current machine
# atm Intel® Atom™ microarchitecture
# nhm Intel® microarchitecture code name Nehalem
diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
index e030246..a2a9ee3 100644
--- a/config/defconfig_i686-native-linuxapp-icc
+++ b/config/defconfig_i686-native-linuxapp-icc
@@ -35,7 +35,7 @@
#
# machine can define specific variables or action for a specific board
# RTE_MACHINE can be:
-# default nothing specific
+# core2 nothing specific
# native current machine
# atm Intel® Atom™ microarchitecture
# nhm Intel® microarchitecture code name Nehalem
diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
index b131dea..e5c1d97 100644
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ b/config/defconfig_x86_64-native-bsdapp-gcc
@@ -43,7 +43,7 @@ CONFIG_RTE_EXEC_ENV_BSDAPP=y
#
# machine can define specific variables or action for a specific board
# RTE_MACHINE can be:
-# default nothing specific
+# core2 nothing specific
# native current machine
# atm Intel® Atom™ microarchitecture
# nhm Intel® microarchitecture code name Nehalem
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index 2a4ce89..a1b5a89 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -35,7 +35,7 @@
#
# machine can define specific variables or action for a specific board
# RTE_MACHINE can be:
-# default nothing specific
+# core2 nothing specific
# native current machine
# atm Intel® Atom™ microarchitecture
# nhm Intel® microarchitecture code name Nehalem
diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
index b2774e1..2e1ee99 100644
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ b/config/defconfig_x86_64-native-linuxapp-icc
@@ -35,7 +35,7 @@
#
# machine can define specific variables or action for a specific board
# RTE_MACHINE can be:
-# default nothing specific
+# core2 nothing specific
# native current machine
# atm Intel® Atom™ microarchitecture
# nhm Intel® microarchitecture code name Nehalem
diff --git a/mk/machine/core2/rte.vars.mk b/mk/machine/core2/rte.vars.mk
new file mode 100644
index 0000000..f05105a
--- /dev/null
+++ b/mk/machine/core2/rte.vars.mk
@@ -0,0 +1,58 @@
+# 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.
+
+#
+# machine:
+#
+# - can define ARCH variable (overriden by cmdline value)
+# - can define CROSS variable (overriden by cmdline value)
+# - define MACHINE_CFLAGS variable (overriden by cmdline value)
+# - define MACHINE_LDFLAGS variable (overriden by cmdline value)
+# - define MACHINE_ASFLAGS variable (overriden by cmdline value)
+# - can define CPU_CFLAGS variable (overriden by cmdline value) that
+# overrides the one defined in arch.
+# - can define CPU_LDFLAGS variable (overriden by cmdline value) that
+# overrides the one defined in arch.
+# - can define CPU_ASFLAGS variable (overriden by cmdline value) that
+# overrides the one defined in arch.
+# - may override any previously defined variable
+#
+
+# ARCH =
+# CROSS =
+# MACHINE_CFLAGS =
+# MACHINE_LDFLAGS =
+# MACHINE_ASFLAGS =
+# CPU_CFLAGS =
+# CPU_LDFLAGS =
+# CPU_ASFLAGS =
+
+MACHINE_CFLAGS += -march=core2
diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk
deleted file mode 100644
index f05105a..0000000
--- a/mk/machine/default/rte.vars.mk
+++ /dev/null
@@ -1,58 +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.
-
-#
-# machine:
-#
-# - can define ARCH variable (overriden by cmdline value)
-# - can define CROSS variable (overriden by cmdline value)
-# - define MACHINE_CFLAGS variable (overriden by cmdline value)
-# - define MACHINE_LDFLAGS variable (overriden by cmdline value)
-# - define MACHINE_ASFLAGS variable (overriden by cmdline value)
-# - can define CPU_CFLAGS variable (overriden by cmdline value) that
-# overrides the one defined in arch.
-# - can define CPU_LDFLAGS variable (overriden by cmdline value) that
-# overrides the one defined in arch.
-# - can define CPU_ASFLAGS variable (overriden by cmdline value) that
-# overrides the one defined in arch.
-# - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=core2
diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
index 796cca7..0137df8 100644
--- a/mk/target/generic/rte.vars.mk
+++ b/mk/target/generic/rte.vars.mk
@@ -50,7 +50,7 @@
# - can define CPU_ASFLAGS variable (overriden by cmdline value) that
# overrides the one defined in arch.
#
-# examples for RTE_MACHINE: default, pc, bensley, tylesburg, ...
+# examples for RTE_MACHINE: core2, wsm, snb, ivb ...
#
include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk
diff --git a/pkg/dpdk-core.spec b/pkg/dpdk-core.spec
index 8c0e040..116cec2 100644
--- a/pkg/dpdk-core.spec
+++ b/pkg/dpdk-core.spec
@@ -44,7 +44,7 @@ License: BSD and LGPLv2 and GPLv2
ExclusiveArch: i686, x86_64
%define target %{_arch}-native-linuxapp-gcc
-%define machine default
+%define machine core2
BuildRequires: kernel-devel, kernel-headers, doxygen
--
1.7.10.4