aboutsummaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>2011-06-10 22:21:14 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2011-06-10 22:21:14 +0200
commit448293961f889d635295ad5b1ecc57ce267801ba (patch)
treed91a77a3a5f8fe466ae1a98d1705f8b757f319da /Makefile.target
parent1c532d92ab9bc2a8180296d7abe14f29d762f612 (diff)
parent3b4fefd6e65a7bdb994d10a9fa36c19b5749b502 (diff)
downloadqemu-448293961f889d635295ad5b1ecc57ce267801ba.zip
qemu-448293961f889d635295ad5b1ecc57ce267801ba.tar.gz
qemu-448293961f889d635295ad5b1ecc57ce267801ba.tar.bz2
Merge remote branch 'rth/axp-next' into alpha-merge
* rth/axp-next: (26 commits) target-alpha: Implement TLB flush primitives. target-alpha: Use a fixed frequency for the RPCC in system mode. target-alpha: Trap for unassigned and unaligned addresses. target-alpha: Remap PIO space for 43-bit KSEG for EV6. target-alpha: Implement cpu_alpha_handle_mmu_fault for system mode. target-alpha: Implement more CALL_PAL values inline. target-alpha: Disable interrupts properly. target-alpha: All ISA checks to use TB->FLAGS. target-alpha: Swap shadow registers moving to/from PALmode. target-alpha: Implement do_interrupt for system mode. target-alpha: Add IPRs to be used by the emulation PALcode. target-alpha: Use kernel mmu_idx for pal_mode. target-alpha: Add various symbolic constants. target-alpha: Use do_restore_state for arithmetic exceptions. target-alpha: Tidy up arithmetic exceptions. target-alpha: Tidy exception constants. target-alpha: Enable the alpha-softmmu target. target-alpha: Rationalize internal processor registers. target-alpha: Merge HW_REI and HW_RET implementations. target-alpha: Cleanup MMU modes. ...
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index f7cb17d..b1a0f6d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -374,7 +374,8 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o
obj-s390x-y = s390-virtio-bus.o s390-virtio.o
-obj-alpha-y = alpha_palcode.o
+obj-alpha-y = i8259.o mc146818rtc.o
+obj-alpha-y += vga.o cirrus_vga.o
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)