summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 14:09:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:56 +0100
commit6ad8d642d2a2ed3400967e1b504930bacd1961e2 (patch)
tree1d36578b220c8e1b6f195f67addd905ff4342f1f
parent0404123e2da7fb1d6345dfb515a167adbb968f28 (diff)
downloadpoky-6ad8d642d2a2ed3400967e1b504930bacd1961e2.tar.gz
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>
-rw-r--r--meta/classes/qemu.bbclass12
-rw-r--r--meta/conf/bitbake.conf13
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):
33 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\ 33 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
34 + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\ 34 + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
35 + rootfs_path + binary 35 + rootfs_path + binary
36
37QEMU_OPTIONS = ""
38QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5"
39QEMU_OPTIONS_armv6 = "-cpu arm1136"
40QEMU_OPTIONS_armv7a = "-cpu cortex-a8"
41QEMU_OPTIONS_e500v2 = "-cpu e500v2"
42QEMU_OPTIONS_e500mc = "-cpu e500mc"
43QEMU_OPTIONS_e5500 = "-cpu e5500"
44QEMU_OPTIONS_e5500-64b = "-cpu e5500"
45QEMU_OPTIONS_e6500 = "-cpu e6500"
46QEMU_OPTIONS_e6500-64b = "-cpu e6500"
47QEMU_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"
144MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 144MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
145MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" 145MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
146 146
147# select proper CPU to get binary locales generated
148QEMU_OPTIONS = ""
149QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5"
150QEMU_OPTIONS_armv6 = "-cpu arm1136"
151QEMU_OPTIONS_armv7a = "-cpu cortex-a8"
152QEMU_OPTIONS_e500v2 = "-cpu e500v2"
153QEMU_OPTIONS_e500mc = "-cpu e500mc"
154QEMU_OPTIONS_e5500 = "-cpu e5500"
155QEMU_OPTIONS_e5500-64b = "-cpu e5500"
156QEMU_OPTIONS_e6500 = "-cpu e6500"
157QEMU_OPTIONS_e6500-64b = "-cpu e6500"
158QEMU_OPTIONS_ppc7400 = "-cpu 7400"
159
160################################################################## 147##################################################################
161# Date/time variables. 148# Date/time variables.
162################################################################## 149##################################################################