diff options
author | 2009-11-22 15:29:41 +0200 | |
---|---|---|
committer | 2009-11-22 15:29:41 +0200 | |
commit | 5ba85b849016cb2808765b6b5c18e1ed4cf2c179 (patch) | |
tree | 9b9804382b6e0b83a0efbc6ef5b0d6478d367d91 /Makefile.target | |
parent | Merge commit 'cfc6d90a98ec420998ef2009e359ea04456735ff' into upstream-merge (diff) | |
parent | configure: Fix spelling in comment and rework the comment (diff) | |
download | qemu-kvm-5ba85b849016cb2808765b6b5c18e1ed4cf2c179.tar.gz qemu-kvm-5ba85b849016cb2808765b6b5c18e1ed4cf2c179.tar.bz2 qemu-kvm-5ba85b849016cb2808765b6b5c18e1ed4cf2c179.zip |
Merge commit '3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c' into upstream-merge
* commit '3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c':
configure: Fix spelling in comment and rework the comment
qemu-io: build on all platforms
slirp: fix use-after-free
ARM PBX-A9 board support
ARM Cortex-A9 cpu support
ARM FP16 support
Built network devices once
sb16: remove highspeed reset code
audio: Remove conditional around sw which can not be NULL
audio: link with -lpulse in addition to -lpulse-simple
Fix typo
Fix mingw32 build
Prevent configuring for a user emulator on a different type of OS
Conflicts:
configure
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index 8ee5b23ac..9527404b5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -296,10 +296,10 @@ obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o endif -obj-arm-y = integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o +obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o obj-arm-y += versatile_pci.o -obj-arm-y += realview_gic.o realview.o arm_sysctl.o mpcore.o +obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o obj-arm-y += pl061.o obj-arm-y += arm-semi.o @@ -317,7 +317,6 @@ obj-arm-y += framebuffer.o obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o obj-arm-y += syborg_virtio.o -obj-arm-y += lan9118.o obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o |