diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-12-27 10:04:44 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-12-27 10:04:44 +0200 |
commit | 74d7d1643dc1ee37c6189d78d66c0e5c5336e7ba (patch) | |
tree | dad47997fd1427689b522eb3d1388b913a1583f4 /meta-linaro | |
parent | 937e0aa740836bb14fa7f7e2935fefb0bc3a7229 (diff) |
qemu: drop aarch64-softmmu.patch - merged
Fix QEMU build failure, breaking OE images since 9 days.
Change-Id: Iab4bf9a2e832ae00899a73e8f018a739ac70c1b9
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'meta-linaro')
-rw-r--r-- | meta-linaro/recipes-devtools/qemu/files/aarch64-softmmu.patch | 103 | ||||
-rw-r--r-- | meta-linaro/recipes-devtools/qemu/qemu_git.bb | 4 |
2 files changed, 2 insertions, 105 deletions
diff --git a/meta-linaro/recipes-devtools/qemu/files/aarch64-softmmu.patch b/meta-linaro/recipes-devtools/qemu/files/aarch64-softmmu.patch deleted file mode 100644 index d684080d..00000000 --- a/meta-linaro/recipes-devtools/qemu/files/aarch64-softmmu.patch +++ /dev/null @@ -1,103 +0,0 @@ - -m: Peter Maydell <peter.maydell@linaro.org> -Date: Fri, 9 Aug 2013 13:19:04 +0000 (+0100) -Subject: default-configs: Add config for aarch64-softmmu -X-Git-Url: https://git.linaro.org/gitweb?p=people%2Fpmaydell%2Fqemu-arm.git;a=commitdiff_plain;h=5b60e30712cbdf478b77ada9433c7f0d1b9d07bd - -default-configs: Add config for aarch64-softmmu - -Add a config for aarch64-softmmu; this enables building of this target. -The resulting executable doesn't know about any 64 bit CPUs, but all -the 32 bit CPUs and board models work. - -Signed-off-by: Peter Maydell <peter.maydell@linaro.org> ---- - -diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak -new file mode 100644 -index 0000000..175362f ---- /dev/null -+++ b/default-configs/aarch64-softmmu.mak -@@ -0,0 +1,82 @@ -+# Default configuration for aarch64-softmmu -+ -+include pci.mak -+include usb.mak -+CONFIG_GDBSTUB_XML=y -+CONFIG_VGA=y -+CONFIG_ISA_MMIO=y -+CONFIG_NAND=y -+CONFIG_ECC=y -+CONFIG_SERIAL=y -+CONFIG_PTIMER=y -+CONFIG_SD=y -+CONFIG_MAX7310=y -+CONFIG_WM8750=y -+CONFIG_TWL92230=y -+CONFIG_TSC2005=y -+CONFIG_LM832X=y -+CONFIG_TMP105=y -+CONFIG_STELLARIS=y -+CONFIG_STELLARIS_INPUT=y -+CONFIG_STELLARIS_ENET=y -+CONFIG_SSD0303=y -+CONFIG_SSD0323=y -+CONFIG_ADS7846=y -+CONFIG_MAX111X=y -+CONFIG_SSI=y -+CONFIG_SSI_SD=y -+CONFIG_SSI_M25P80=y -+CONFIG_LAN9118=y -+CONFIG_SMC91C111=y -+CONFIG_DS1338=y -+CONFIG_PFLASH_CFI01=y -+CONFIG_PFLASH_CFI02=y -+CONFIG_MICRODRIVE=y -+CONFIG_USB_MUSB=y -+ -+CONFIG_ARM11MPCORE=y -+CONFIG_A9MPCORE=y -+CONFIG_A15MPCORE=y -+ -+CONFIG_ARM_GIC=y -+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM) -+CONFIG_ARM_TIMER=y -+CONFIG_ARM_MPTIMER=y -+CONFIG_PL011=y -+CONFIG_PL022=y -+CONFIG_PL031=y -+CONFIG_PL041=y -+CONFIG_PL050=y -+CONFIG_PL061=y -+CONFIG_PL080=y -+CONFIG_PL110=y -+CONFIG_PL181=y -+CONFIG_PL190=y -+CONFIG_PL310=y -+CONFIG_PL330=y -+CONFIG_CADENCE=y -+CONFIG_XGMAC=y -+CONFIG_EXYNOS4=y -+CONFIG_PXA2XX=y -+CONFIG_BITBANG_I2C=y -+CONFIG_FRAMEBUFFER=y -+CONFIG_XILINX_SPIPS=y -+ -+CONFIG_A9SCU=y -+CONFIG_MARVELL_88W8618=y -+CONFIG_OMAP=y -+CONFIG_TSC210X=y -+CONFIG_BLIZZARD=y -+CONFIG_ONENAND=y -+CONFIG_TUSB6010=y -+CONFIG_IMX=y -+CONFIG_MAINSTONE=y -+CONFIG_NSERIES=y -+CONFIG_REALVIEW=y -+CONFIG_ZAURUS=y -+CONFIG_ZYNQ=y -+ -+CONFIG_VERSATILE_PCI=y -+CONFIG_VERSATILE_I2C=y -+ -+CONFIG_SDHCI=y diff --git a/meta-linaro/recipes-devtools/qemu/qemu_git.bb b/meta-linaro/recipes-devtools/qemu/qemu_git.bb index 86f589ef..40dafe5b 100644 --- a/meta-linaro/recipes-devtools/qemu/qemu_git.bb +++ b/meta-linaro/recipes-devtools/qemu/qemu_git.bb @@ -13,8 +13,8 @@ PV = "1.6.0+git${SRCPV}" PR = "r2" SRC_URI = "git://git.qemu.org/qemu.git \ - file://aarch64-softmmu.patch \ - file://powerpc_rom.bin " + file://powerpc_rom.bin \ + " S = "${WORKDIR}/git" EXTRA_OECONF+="--enable-kvm --enable-fdt " |