bitbake.conf/qemu: Move QEMU_OPTIONS to qemu.bbclass

The QEMU_OPTIONS variables belong in qemu.bbclass so move them there. The
only users of them inherit qemu.bbclass. There is no point in pushing
these into every recipe.

(From OE-Core rev: 5824293de37919e89f60192836997281933e23d6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 12 insertions, 13 deletions

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 3d437b0e45..abee8aaa7c 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -33,3 +33,15 @@ def qemu_run_binary(data, rootfs_path, binary):
     return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
             + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
             + rootfs_path + binary
+
+QEMU_OPTIONS = ""
+QEMU_OPTIONS_iwmmxt    = "-cpu pxa270-c5"
+QEMU_OPTIONS_armv6     = "-cpu arm1136"
+QEMU_OPTIONS_armv7a    = "-cpu cortex-a8"
+QEMU_OPTIONS_e500v2    = "-cpu e500v2"
+QEMU_OPTIONS_e500mc    = "-cpu e500mc"
+QEMU_OPTIONS_e5500     = "-cpu e5500"
+QEMU_OPTIONS_e5500-64b = "-cpu e5500"
+QEMU_OPTIONS_e6500     = "-cpu e6500"
+QEMU_OPTIONS_e6500-64b = "-cpu e6500"
+QEMU_OPTIONS_ppc7400   = "-cpu 7400"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1dc8860480..1856142927 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -144,19 +144,6 @@ PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
 MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
 
-# select proper CPU to get binary locales generated
-QEMU_OPTIONS = ""
-QEMU_OPTIONS_iwmmxt  = "-cpu pxa270-c5"
-QEMU_OPTIONS_armv6   = "-cpu arm1136"
-QEMU_OPTIONS_armv7a   = "-cpu cortex-a8"
-QEMU_OPTIONS_e500v2    = "-cpu e500v2"
-QEMU_OPTIONS_e500mc    = "-cpu e500mc"
-QEMU_OPTIONS_e5500     = "-cpu e5500"
-QEMU_OPTIONS_e5500-64b = "-cpu e5500"
-QEMU_OPTIONS_e6500     = "-cpu e6500"
-QEMU_OPTIONS_e6500-64b = "-cpu e6500"
-QEMU_OPTIONS_ppc7400 = "-cpu 7400"
-
 ##################################################################
 # Date/time variables.
 ##################################################################