qemu-fsl: upgrade from v1.7 to v2.2.0

Update the supported QEMU version from v1.7 to v2.2.0 and include the Freescale patches on top of this.

Baseline: http://git.qemu.org/?p=qemu.git;a=tag;h=refs/tags/v2.2.0
Freescale patches:
00ac004 QEMU: PPC: Support for VFIO_IOMMU_DUMMY.
58d1cc4 QEMU: PPC: Identity mapped memory support for qemu.
07d4f5f Qemu: PPC: e500: Move CCSR and MMIO space to upper end of address space
a7aee41 QEMU: PPC: e500: Move CCSR definition to params fbcc0ca vfio-pci: add direct pci device assignment for fsl powerpc
536df03 Update Linux Headers from 3.18
ee367e4 QEMU:Add support for e5500 core revision v102.1 present on T1024 SOC.
b0c2f44 hw/arm/virt: Use memory_region_allocate_system_memory to allocate memory b2f233e PPC: add e6500 cpu class 694c39a QEMU: PPC: set default cpu type to be 'host'
1572872 QEMU: PPC: specify PVRs for all e500 cores

Also fix indent.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 14 insertions, 16 deletions

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
index 35ca79ce..25d22978 100644
--- a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
@@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 
 # versions
-PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_qemu = "2.2.0+fsl"
 PREFERRED_VERSION_openssl = "1.0.1i"
 
 # settings
diff --git a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
index 32e738e9..f977a379 100644
--- a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
@@ -3,19 +3,17 @@ require recipes-devtools/qemu/qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-# This means QEMU v1.7 with FSL specific patches applied
-PV = "1.7+fsl"
+# This means QEMU v2.2.0 with FSL specific patches applied
+PV = "2.2.0+fsl"
 
-# NOTE: these options are note available in qemu 1.7, but qemu.inc assumes
-# version 2.0+ where they are available. For now we unset them, but we should
-# remove the following lines when upgrading to qemu 2.0+:
-PACKAGECONFIG[quorum] = ""
-PACKAGECONFIG[lzo]    = ""
-PACKAGECONFIG[numa]   = ""
-PACKAGECONFIG[gtk+] = ""
+# NOTE: this recipe requires poky's qemu.inc which assumes version 2.3
+# where glx enable config option changed to --enable-opengl. For now we
+# restore it, but we should remove the following lines when upgrading
+# to qemu 2.3:
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1"
-SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
+SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
 
 S = "${WORKDIR}/git"
 
@@ -29,20 +27,20 @@ EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}"
 
 do_configure_prepend() {
-        export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
+    export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
 }
 
 do_configure_append () {
-        grep 'CONFIG_FDT=y' config-host.mak
+    grep 'CONFIG_FDT=y' config-host.mak
 }
 
 # gets around qemu.inc trying to install powerpc_rom.bin
 do_install_prepend() {
-        touch ${WORKDIR}/powerpc_rom.bin
+    touch ${WORKDIR}/powerpc_rom.bin
 }
 
 do_install_append() {
-        rm ${WORKDIR}/powerpc_rom.bin
+    rm ${WORKDIR}/powerpc_rom.bin
     # Prevent QA warnings about installed ${localstatedir}/run
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
 }