On Tue, Jan 21, 2014 at 02:39:47PM -0800, Darren Hart wrote: > 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. > > Signed-off-by: Darren Hart > Cc: Richard Purdie > Cc: Paul Eggleton > Cc: Tom Zanussi > Cc: Nitin Kamble > Cc: Mark Hatle > Cc: Bruce Ashfield > --- > meta/conf/machine/include/tune-c3.inc | 2 +- > meta/conf/machine/include/tune-i586.inc | 2 +- > meta/conf/machine/include/tune-x86_64.inc | 2 +- > .../include/{ia32-base.inc => x86-base.inc} | 16 ++++++++-------- > meta/conf/machine/include/{ia32 => x86}/README | 6 +++--- > .../{ia32/arch-ia32.inc => x86/arch-x86.inc} | 2 +- > 6 files changed, 15 insertions(+), 15 deletions(-) > rename meta/conf/machine/include/{ia32-base.inc => x86-base.inc} (75%) > rename meta/conf/machine/include/{ia32 => x86}/README (81%) > rename meta/conf/machine/include/{ia32/arch-ia32.inc => x86/arch-x86.inc} (97%) > > diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc > index 18865b7..fafc28a 100644 > --- a/meta/conf/machine/include/tune-c3.inc > +++ b/meta/conf/machine/include/tune-c3.inc > @@ -1,4 +1,4 @@ > -require conf/machine/include/ia32/arch-ia32.inc > +require conf/machine/include/x86/arch-x86.inc > > TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations" > TUNECONFLICTS[c3] = "m64 mx32" > diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc > index 4542b9b..a315b35 100644 > --- a/meta/conf/machine/include/tune-i586.inc > +++ b/meta/conf/machine/include/tune-i586.inc > @@ -1,6 +1,6 @@ > DEFAULTTUNE ?= "i586" > > -require conf/machine/include/ia32/arch-ia32.inc > +require conf/machine/include/x86/arch-x86.inc > > # Extra tune features > 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 31e06da..ae48124 100644 > --- a/meta/conf/machine/include/tune-x86_64.inc > +++ b/meta/conf/machine/include/tune-x86_64.inc > @@ -1,4 +1,4 @@ > DEFAULTTUNE ?= "x86-64" > > -require conf/machine/include/ia32/arch-ia32.inc > +require conf/machine/include/x86/arch-x86.inc > > diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/x86-base.inc > similarity index 75% > rename from meta/conf/machine/include/ia32-base.inc > rename to meta/conf/machine/include/x86-base.inc > index e15f927..421bdee 100644 > --- a/meta/conf/machine/include/ia32-base.inc > +++ b/meta/conf/machine/include/x86-base.inc > @@ -1,5 +1,5 @@ > # > -# base machine settings for ia32-architecture BSPs > +# Base machine settings for Intel architecture BSPs does it apply for AMD, Cyrix as well? > # > > # > @@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= "3.0%" > # > # XSERVER subcomponents, used to build the XSERVER variable > # > -XSERVER_IA32_BASE = "xserver-xorg \ > +XSERVER_INTEL_BASE = "xserver-xorg \ the same, why not us XSERVER_X86_BASE? > xf86-input-mouse \ > xf86-input-keyboard \ > xf86-input-evdev \ > xf86-input-synaptics \ > " > > -XSERVER_IA32_EXT = " \ > +XSERVER_INTEL_EXT = " \ > ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ > xserver-xorg-module-libint10 \ > " > > -XSERVER_IA32_I915 = "xf86-video-intel \ > +XSERVER_INTEL_I915 = "xf86-video-intel \ > ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ > " > > -XSERVER_IA32_I965 = "xf86-video-intel \ > +XSERVER_INTEL_I965 = "xf86-video-intel \ > ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ > " > > -XSERVER_IA32_VESA = "xf86-video-vesa" > +XSERVER_INTEL_VESA = "xf86-video-vesa" > > -XSERVER_IA32_FBDEV = "xf86-video-fbdev" > +XSERVER_INTEL_FBDEV = "xf86-video-fbdev" > > -XSERVER_IA32_MODESETTING = "xf86-video-modesetting" > +XSERVER_INTEL_MODESETTING = "xf86-video-modesetting" > diff --git a/meta/conf/machine/include/ia32/README b/meta/conf/machine/include/x86/README > similarity index 81% > rename from meta/conf/machine/include/ia32/README > rename to meta/conf/machine/include/x86/README > index 8f80a5b..d8b6793 100644 > --- a/meta/conf/machine/include/ia32/README > +++ b/meta/conf/machine/include/x86/README > @@ -1,12 +1,12 @@ > 2012/03/30 - Mark Hatle > - Initial version > > -Most of the items for the IA architecture are defined in the single > -arch-ia32 file. > +Most of the items for the Intel architectures are defined in the single > +arch-x86 file. > > Three ABIs are define, m32, mx32 and m64. > > -The following is the list of ia32 specific variables: > +The following is the list of intel specific variables: > > X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH. > > diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/x86/arch-x86.inc > similarity index 97% > rename from meta/conf/machine/include/ia32/arch-ia32.inc > rename to meta/conf/machine/include/x86/arch-x86.inc > index aa83896..298bddc 100644 > --- a/meta/conf/machine/include/ia32/arch-ia32.inc > +++ b/meta/conf/machine/include/x86/arch-x86.inc > @@ -1,5 +1,5 @@ > # > -# IA32 Architecture definition > +# X86 Architecture definition (IA32, X86_64, and X32) > # > > DEFAULTTUNE ?= "x86" > -- > 1.7.9.5 > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com