summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-07-25 01:12:53 +0000
committerMatthew McClintock <msm@freescale.com>2012-09-05 18:57:25 -0500
commit46f86c3fe041f83457f33d8c4c401101e6209880 (patch)
tree1a6b75cf19fea60e4ff44d2999f8fc9dc376a61e /conf/machine
parent3db20e4853731e7cd3343d3007854d23feeeb16c (diff)
downloadmeta-fsl-ppc-46f86c3fe041f83457f33d8c4c401101e6209880.tar.gz
qemu: set preferred version for QEMU
The preferred version needs to specify the QEMU version for our qemu_git recipe (overridden by the QEMU bbappends). Without this patch we will no pick up our qemu_git recipe. Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/e500mc.inc1
-rw-r--r--conf/machine/e500v2.inc1
-rw-r--r--conf/machine/e5500-64b.inc1
-rw-r--r--conf/machine/e5500.inc1
4 files changed, 4 insertions, 0 deletions
diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index acb55c3..9f7ed31 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
11PREFERRED_VERSION_qemu = "1.0+fsl"
11 12
12KERNEL_IMAGETYPE ?= "uImage" 13KERNEL_IMAGETYPE ?= "uImage"
13# disable the images below for now 14# disable the images below for now
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 2b83795..da515da 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -6,6 +6,7 @@ MACHINE_EXTRA_RRECOMMENDS = ""
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
7PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 7PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
8PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 8PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
9PREFERRED_VERSION_qemu = "1.0+fsl"
9 10
10KERNEL_IMAGETYPE ?= "uImage" 11KERNEL_IMAGETYPE ?= "uImage"
11# disable the images below for now 12# disable the images below for now
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 79639f6..709880e 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -9,6 +9,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 9PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
10PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 10PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
12PREFERRED_VERSION_qemu = "1.0+fsl"
12 13
13KERNEL_IMAGETYPE ?= "uImage" 14KERNEL_IMAGETYPE ?= "uImage"
14# disable the images below for now 15# disable the images below for now
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index b89041b..75c333a 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" 8PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
9PREFERRED_VERSION_virtual/kernel ?= "3.0.34" 9PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 10PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
11PREFERRED_VERSION_qemu = "1.0+fsl"
11 12
12KERNEL_IMAGETYPE ?= "uImage" 13KERNEL_IMAGETYPE ?= "uImage"
13# disable the images below for now 14# disable the images below for now