[dpdk-dev] [PATCH 3/3] config: rename "default" machine type as "core2"

David Marchand david.marchand at 6wind.com
Wed May 14 16:58:09 CEST 2014


"default" machine type refers to core2 -march, so rename the machine directory
to avoid misunderstanding it.

Signed-off-by: David Marchand <david.marchand at 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



More information about the dev mailing list