From 939fec6ffc8f51f4f7f98f908554646b50b1ecaf Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 17 Jan 2014 22:25:36 +0000 Subject: 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 Cc: Richard Purdie Cc: Paul Eggleton Cc: Tom Zanussi Cc: Nitin Kamble Cc: Mark Hatle Cc: Bruce Ashfield Cc: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32-base.inc | 52 ---------------------------- meta/conf/machine/include/ia32/README | 24 ------------- meta/conf/machine/include/ia32/arch-ia32.inc | 51 --------------------------- 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 +- meta/conf/machine/include/x86-base.inc | 52 ++++++++++++++++++++++++++++ meta/conf/machine/include/x86/README | 24 +++++++++++++ meta/conf/machine/include/x86/arch-x86.inc | 51 +++++++++++++++++++++++++++ 9 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 meta/conf/machine/include/ia32-base.inc delete mode 100644 meta/conf/machine/include/ia32/README delete mode 100644 meta/conf/machine/include/ia32/arch-ia32.inc create mode 100644 meta/conf/machine/include/x86-base.inc create mode 100644 meta/conf/machine/include/x86/README create mode 100644 meta/conf/machine/include/x86/arch-x86.inc (limited to 'meta/conf') diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc deleted file mode 100644 index e15f9273ff..0000000000 --- a/meta/conf/machine/include/ia32-base.inc +++ /dev/null @@ -1,52 +0,0 @@ -# -# base machine settings for ia32-architecture BSPs -# - -# -# common settings for Intel-based machines -# -MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget alsa" - -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -IMAGE_FSTYPES += "live" - -KERNEL_IMAGETYPE ?= "bzImage" - -SERIAL_CONSOLE ?= "115200 ttyS0" - -# -# kernel-related variables -# -PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "3.0%" - -# -# XSERVER subcomponents, used to build the XSERVER variable -# -XSERVER_IA32_BASE = "xserver-xorg \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - " - -XSERVER_IA32_EXT = " \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ - xserver-xorg-module-libint10 \ - " - -XSERVER_IA32_I915 = "xf86-video-intel \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ - " - -XSERVER_IA32_I965 = "xf86-video-intel \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ - " - -XSERVER_IA32_VESA = "xf86-video-vesa" - -XSERVER_IA32_FBDEV = "xf86-video-fbdev" - -XSERVER_IA32_MODESETTING = "xf86-video-modesetting" diff --git a/meta/conf/machine/include/ia32/README b/meta/conf/machine/include/ia32/README deleted file mode 100644 index 8f80a5ba94..0000000000 --- a/meta/conf/machine/include/ia32/README +++ /dev/null @@ -1,24 +0,0 @@ -2012/03/30 - Mark Hatle - - Initial version - -Most of the items for the IA architecture are defined in the single -arch-ia32 file. - -Three ABIs are define, m32, mx32 and m64. - -The following is the list of ia32 specific variables: - -X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH. - -X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH. - -The TUNE_PKGARCH is defined as follows: - -TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} - -The package architecture for 32-bit targets is historical and generally -set to to match the core compatible processor type, i.e. i386. - -For 64-bit architectures, the architecture is expected to end in '_64'. - -If the x32 ABI is used, then the _64 is further extended with a '_x32'. diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc deleted file mode 100644 index aa83896eb6..0000000000 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ /dev/null @@ -1,51 +0,0 @@ -# -# IA32 Architecture definition -# - -DEFAULTTUNE ?= "x86" -TARGET_FPU ?= "" -X86ARCH32 ?= "i586" -X86ARCH64 ?= "x86_64" - -TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" - -# ELF32 ABI -TUNEVALID[m32] = "IA32 ELF32 standard ABI" -TUNECONFLICTS[m32] = "m64 mx32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" -TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "m32", " -m32", "", d)}" -MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86:", "" ,d)}" - -# x32 ABI -TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" -TUNECONFLICTS[mx32] = "m64 m32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "${X86ARCH64}", "" ,d)}" -ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x32", "" ,d)}" -TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", " -mx32", "", d)}" -TUNE_LDARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-m elf32_x86_64", "", d)}" -TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" - -# ELF64 ABI -TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" -TUNECONFLICTS[m64] = "m32 mx32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" -TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "m64", " -m64", "", d)}" - -# Default Tune configurations -AVAILTUNES += "x86" -TUNE_FEATURES_tune-x86 = "m32" -BASE_LIB_tune-x86 = "lib" -TUNE_PKGARCH_tune-x86 = "x86" -PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" - -AVAILTUNES += "x86-64" -TUNE_FEATURES_tune-x86-64 = "m64" -BASE_LIB_tune-x86-64 = "lib64" -TUNE_PKGARCH_tune-x86-64 = "x86_64" -PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" - -AVAILTUNES += "x86-64-x32" -TUNE_FEATURES_tune-x86-64-x32 = "mx32" -BASE_LIB_tune-x86-64-x32 = "libx32" -TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" -PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" 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 @@ -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 4542b9b6f1..a315b35de6 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 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 @@ 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/x86-base.inc b/meta/conf/machine/include/x86-base.inc new file mode 100644 index 0000000000..d6c4d6010f --- /dev/null +++ b/meta/conf/machine/include/x86-base.inc @@ -0,0 +1,52 @@ +# +# Base machine settings for X86 architecture BSPs +# + +# +# common settings for X86 machines +# +MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ + acpi serial usbgadget alsa" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +IMAGE_FSTYPES += "live" + +KERNEL_IMAGETYPE ?= "bzImage" + +SERIAL_CONSOLE ?= "115200 ttyS0" + +# +# kernel-related variables +# +PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" +PREFERRED_VERSION_linux-yocto ??= "3.0%" + +# +# XSERVER subcomponents, used to build the XSERVER variable +# +XSERVER_X86_BASE = "xserver-xorg \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-input-evdev \ + xf86-input-synaptics \ + " + +XSERVER_X86_EXT = " \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ + xserver-xorg-module-libint10 \ + " + +XSERVER_X86_I915 = "xf86-video-intel \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ + " + +XSERVER_X86_I965 = "xf86-video-intel \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ + " + +XSERVER_X86_VESA = "xf86-video-vesa" + +XSERVER_X86_FBDEV = "xf86-video-fbdev" + +XSERVER_X86_MODESETTING = "xf86-video-modesetting" diff --git a/meta/conf/machine/include/x86/README b/meta/conf/machine/include/x86/README new file mode 100644 index 0000000000..2b6c46c7eb --- /dev/null +++ b/meta/conf/machine/include/x86/README @@ -0,0 +1,24 @@ +2012/03/30 - Mark Hatle + - Initial version + +Most of the items for the X86 architectures are defined in the single +arch-x86 file. + +Three ABIs are define, m32, mx32 and m64. + +The following is the list of X86 specific variables: + +X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH. + +X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH. + +The TUNE_PKGARCH is defined as follows: + +TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} + +The package architecture for 32-bit targets is historical and generally +set to to match the core compatible processor type, i.e. i386. + +For 64-bit architectures, the architecture is expected to end in '_64'. + +If the x32 ABI is used, then the _64 is further extended with a '_x32'. diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc new file mode 100644 index 0000000000..298bddc6a1 --- /dev/null +++ b/meta/conf/machine/include/x86/arch-x86.inc @@ -0,0 +1,51 @@ +# +# X86 Architecture definition (IA32, X86_64, and X32) +# + +DEFAULTTUNE ?= "x86" +TARGET_FPU ?= "" +X86ARCH32 ?= "i586" +X86ARCH64 ?= "x86_64" + +TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" + +# ELF32 ABI +TUNEVALID[m32] = "IA32 ELF32 standard ABI" +TUNECONFLICTS[m32] = "m64 mx32" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "m32", " -m32", "", d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86:", "" ,d)}" + +# x32 ABI +TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" +TUNECONFLICTS[mx32] = "m64 m32" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "${X86ARCH64}", "" ,d)}" +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x32", "" ,d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", " -mx32", "", d)}" +TUNE_LDARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-m elf32_x86_64", "", d)}" +TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" + +# ELF64 ABI +TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" +TUNECONFLICTS[m64] = "m32 mx32" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "m64", " -m64", "", d)}" + +# Default Tune configurations +AVAILTUNES += "x86" +TUNE_FEATURES_tune-x86 = "m32" +BASE_LIB_tune-x86 = "lib" +TUNE_PKGARCH_tune-x86 = "x86" +PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" + +AVAILTUNES += "x86-64" +TUNE_FEATURES_tune-x86-64 = "m64" +BASE_LIB_tune-x86-64 = "lib64" +TUNE_PKGARCH_tune-x86-64 = "x86_64" +PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" + +AVAILTUNES += "x86-64-x32" +TUNE_FEATURES_tune-x86-64-x32 = "mx32" +BASE_LIB_tune-x86-64-x32 = "libx32" +TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" +PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" -- cgit v1.2.3-54-g00ecf