diff options
author | Ting Liu <ting.liu@freescale.com> | 2015-07-17 15:17:50 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-07-20 17:17:03 +0800 |
commit | 990d1a34331d057becdf78d07cee6e971c9857c4 (patch) | |
tree | f9e2ab9f857b21bc8ab759c950608065020ea549 /recipes-devtools | |
parent | 13fab1f61ed5ed281c9d7e005191a9946769c68b (diff) | |
download | meta-fsl-ppc-990d1a34331d057becdf78d07cee6e971c9857c4.tar.gz |
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>
Diffstat (limited to 'recipes-devtools')
-rw-r--r-- | recipes-devtools/qemu/qemu_fslgit.bb | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb index 32e738e..f977a37 100644 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ b/recipes-devtools/qemu/qemu_fslgit.bb | |||
@@ -3,19 +3,17 @@ require recipes-devtools/qemu/qemu.inc | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
5 | 5 | ||
6 | # This means QEMU v1.7 with FSL specific patches applied | 6 | # This means QEMU v2.2.0 with FSL specific patches applied |
7 | PV = "1.7+fsl" | 7 | PV = "2.2.0+fsl" |
8 | 8 | ||
9 | # NOTE: these options are note available in qemu 1.7, but qemu.inc assumes | 9 | # NOTE: this recipe requires poky's qemu.inc which assumes version 2.3 |
10 | # version 2.0+ where they are available. For now we unset them, but we should | 10 | # where glx enable config option changed to --enable-opengl. For now we |
11 | # remove the following lines when upgrading to qemu 2.0+: | 11 | # restore it, but we should remove the following lines when upgrading |
12 | PACKAGECONFIG[quorum] = "" | 12 | # to qemu 2.3: |
13 | PACKAGECONFIG[lzo] = "" | 13 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa" |
14 | PACKAGECONFIG[numa] = "" | ||
15 | PACKAGECONFIG[gtk+] = "" | ||
16 | 14 | ||
17 | SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1" | 15 | SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master" |
18 | SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db" | 16 | SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a" |
19 | 17 | ||
20 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
21 | 19 | ||
@@ -29,20 +27,20 @@ EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}" | |||
29 | EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}" | 27 | EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}" |
30 | 28 | ||
31 | do_configure_prepend() { | 29 | do_configure_prepend() { |
32 | export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config | 30 | export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config |
33 | } | 31 | } |
34 | 32 | ||
35 | do_configure_append () { | 33 | do_configure_append () { |
36 | grep 'CONFIG_FDT=y' config-host.mak | 34 | grep 'CONFIG_FDT=y' config-host.mak |
37 | } | 35 | } |
38 | 36 | ||
39 | # gets around qemu.inc trying to install powerpc_rom.bin | 37 | # gets around qemu.inc trying to install powerpc_rom.bin |
40 | do_install_prepend() { | 38 | do_install_prepend() { |
41 | touch ${WORKDIR}/powerpc_rom.bin | 39 | touch ${WORKDIR}/powerpc_rom.bin |
42 | } | 40 | } |
43 | 41 | ||
44 | do_install_append() { | 42 | do_install_append() { |
45 | rm ${WORKDIR}/powerpc_rom.bin | 43 | rm ${WORKDIR}/powerpc_rom.bin |
46 | # Prevent QA warnings about installed ${localstatedir}/run | 44 | # Prevent QA warnings about installed ${localstatedir}/run |
47 | if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi | 45 | if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi |
48 | } | 46 | } |