diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-01-17 22:25:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:50:53 +0000 |
commit | 939fec6ffc8f51f4f7f98f908554646b50b1ecaf (patch) | |
tree | afc34dd2c6a97fa714120deed068ed7cffc1f9d0 | |
parent | 721773072da08cf0f5e1206961ada3083b6722b4 (diff) | |
download | poky-939fec6ffc8f51f4f7f98f908554646b50b1ecaf.tar.gz |
x86: Replace ia32 with x86 when referring to the generic architecture
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term "x86" fits this used better
without resorting to using the term "Intel" which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
(From OE-Core rev: f5e0a574d87b7dc6466bfe01593fab5aa13464ff)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Paul Eggleton <paul.eggleton@intel.com>
Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Nitin Kamble <nitin.a.kamble@intel.com>
Cc: Mark Hatle <mark.hatle@windriver.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/machine/include/tune-c3.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-i586.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-x86_64.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/x86-base.inc (renamed from meta/conf/machine/include/ia32-base.inc) | 18 | ||||
-rw-r--r-- | meta/conf/machine/include/x86/README (renamed from meta/conf/machine/include/ia32/README) | 6 | ||||
-rw-r--r-- | meta/conf/machine/include/x86/arch-x86.inc (renamed from meta/conf/machine/include/ia32/arch-ia32.inc) | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc index 18865b7939..fafc28ada0 100644 --- a/meta/conf/machine/include/tune-c3.inc +++ b/meta/conf/machine/include/tune-c3.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | require conf/machine/include/ia32/arch-ia32.inc | 1 | require conf/machine/include/x86/arch-x86.inc |
2 | 2 | ||
3 | TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations" | 3 | TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations" |
4 | TUNECONFLICTS[c3] = "m64 mx32" | 4 | TUNECONFLICTS[c3] = "m64 mx32" |
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc index 4542b9b6f1..a315b35de6 100644 --- a/meta/conf/machine/include/tune-i586.inc +++ b/meta/conf/machine/include/tune-i586.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | DEFAULTTUNE ?= "i586" | 1 | DEFAULTTUNE ?= "i586" |
2 | 2 | ||
3 | require conf/machine/include/ia32/arch-ia32.inc | 3 | require conf/machine/include/x86/arch-x86.inc |
4 | 4 | ||
5 | # Extra tune features | 5 | # Extra tune features |
6 | TUNEVALID[i586] = "Enable i586 specific processor optimizations" | 6 | TUNEVALID[i586] = "Enable i586 specific processor optimizations" |
diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc index 31e06da5ef..ae4812403f 100644 --- a/meta/conf/machine/include/tune-x86_64.inc +++ b/meta/conf/machine/include/tune-x86_64.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | DEFAULTTUNE ?= "x86-64" | 1 | DEFAULTTUNE ?= "x86-64" |
2 | 2 | ||
3 | require conf/machine/include/ia32/arch-ia32.inc | 3 | require conf/machine/include/x86/arch-x86.inc |
4 | 4 | ||
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/x86-base.inc index e15f9273ff..d6c4d6010f 100644 --- a/meta/conf/machine/include/ia32-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
@@ -1,9 +1,9 @@ | |||
1 | # | 1 | # |
2 | # base machine settings for ia32-architecture BSPs | 2 | # Base machine settings for X86 architecture BSPs |
3 | # | 3 | # |
4 | 4 | ||
5 | # | 5 | # |
6 | # common settings for Intel-based machines | 6 | # common settings for X86 machines |
7 | # | 7 | # |
8 | MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ | 8 | MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ |
9 | acpi serial usbgadget alsa" | 9 | acpi serial usbgadget alsa" |
@@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= "3.0%" | |||
25 | # | 25 | # |
26 | # XSERVER subcomponents, used to build the XSERVER variable | 26 | # XSERVER subcomponents, used to build the XSERVER variable |
27 | # | 27 | # |
28 | XSERVER_IA32_BASE = "xserver-xorg \ | 28 | XSERVER_X86_BASE = "xserver-xorg \ |
29 | xf86-input-mouse \ | 29 | xf86-input-mouse \ |
30 | xf86-input-keyboard \ | 30 | xf86-input-keyboard \ |
31 | xf86-input-evdev \ | 31 | xf86-input-evdev \ |
32 | xf86-input-synaptics \ | 32 | xf86-input-synaptics \ |
33 | " | 33 | " |
34 | 34 | ||
35 | XSERVER_IA32_EXT = " \ | 35 | XSERVER_X86_EXT = " \ |
36 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ | 36 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ |
37 | xserver-xorg-module-libint10 \ | 37 | xserver-xorg-module-libint10 \ |
38 | " | 38 | " |
39 | 39 | ||
40 | XSERVER_IA32_I915 = "xf86-video-intel \ | 40 | XSERVER_X86_I915 = "xf86-video-intel \ |
41 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ | 41 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ |
42 | " | 42 | " |
43 | 43 | ||
44 | XSERVER_IA32_I965 = "xf86-video-intel \ | 44 | XSERVER_X86_I965 = "xf86-video-intel \ |
45 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ | 45 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ |
46 | " | 46 | " |
47 | 47 | ||
48 | XSERVER_IA32_VESA = "xf86-video-vesa" | 48 | XSERVER_X86_VESA = "xf86-video-vesa" |
49 | 49 | ||
50 | XSERVER_IA32_FBDEV = "xf86-video-fbdev" | 50 | XSERVER_X86_FBDEV = "xf86-video-fbdev" |
51 | 51 | ||
52 | XSERVER_IA32_MODESETTING = "xf86-video-modesetting" | 52 | XSERVER_X86_MODESETTING = "xf86-video-modesetting" |
diff --git a/meta/conf/machine/include/ia32/README b/meta/conf/machine/include/x86/README index 8f80a5ba94..2b6c46c7eb 100644 --- a/meta/conf/machine/include/ia32/README +++ b/meta/conf/machine/include/x86/README | |||
@@ -1,12 +1,12 @@ | |||
1 | 2012/03/30 - Mark Hatle <mark.hatle@windriver.com> | 1 | 2012/03/30 - Mark Hatle <mark.hatle@windriver.com> |
2 | - Initial version | 2 | - Initial version |
3 | 3 | ||
4 | Most of the items for the IA architecture are defined in the single | 4 | Most of the items for the X86 architectures are defined in the single |
5 | arch-ia32 file. | 5 | arch-x86 file. |
6 | 6 | ||
7 | Three ABIs are define, m32, mx32 and m64. | 7 | Three ABIs are define, m32, mx32 and m64. |
8 | 8 | ||
9 | The following is the list of ia32 specific variables: | 9 | The following is the list of X86 specific variables: |
10 | 10 | ||
11 | X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH. | 11 | X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH. |
12 | 12 | ||
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/x86/arch-x86.inc index aa83896eb6..298bddc6a1 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/x86/arch-x86.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # IA32 Architecture definition | 2 | # X86 Architecture definition (IA32, X86_64, and X32) |
3 | # | 3 | # |
4 | 4 | ||
5 | DEFAULTTUNE ?= "x86" | 5 | DEFAULTTUNE ?= "x86" |