diff options
Diffstat (limited to 'poky/meta/conf')
-rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemuboot-x86.inc | 4 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemux86.conf | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index daacfe28c..668f31324 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -68,7 +68,7 @@ PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" -PREFERRED_VERSION_go-cross-${TARGET_ARCH} ?= "${GOVERSION}" +PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" PREFERRED_VERSION_go-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GOVERSION}" PREFERRED_VERSION_go ?= "${GOVERSION}" diff --git a/poky/meta/conf/machine/include/qemuboot-x86.inc b/poky/meta/conf/machine/include/qemuboot-x86.inc index 5fdbe4df5..82ce46d86 100644 --- a/poky/meta/conf/machine/include/qemuboot-x86.inc +++ b/poky/meta/conf/machine/include/qemuboot-x86.inc @@ -1,8 +1,8 @@ # For runqemu IMAGE_CLASSES += "qemuboot" QB_SYSTEM_NAME_x86 = "qemu-system-i386" -QB_CPU_x86 = "-cpu pentium2" -QB_CPU_KVM_x86 = "-cpu pentium2" +QB_CPU_x86 = "-cpu core2duo" +QB_CPU_KVM_x86 = "-cpu core2duo" QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" QB_CPU_x86-64 = "-cpu core2duo" diff --git a/poky/meta/conf/machine/qemux86.conf b/poky/meta/conf/machine/qemux86.conf index f2434a4b5..272ad1e18 100644 --- a/poky/meta/conf/machine/qemux86.conf +++ b/poky/meta/conf/machine/qemux86.conf @@ -8,8 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" require conf/machine/include/qemu.inc -DEFAULTTUNE ?= "i586" -X86ARCH32 ?= "i586" +DEFAULTTUNE ?= "core2-32" require conf/machine/include/tune-corei7.inc require conf/machine/include/qemuboot-x86.inc |