diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-31 19:37:33 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-31 19:37:33 -0600 |
| commit | 8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e (patch) | |
| tree | 3911782dacfae1ce19cd8eaaedcf1629e17e6d51 /target-unicore32/Makefile.objs | |
| parent | 2854c549e84532f0b76b7884f1903da8a1bf4dbb (diff) | |
| parent | 77868120cfe93ad7816dfac6546684e5a6c6e256 (diff) | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu:
linux-user: bsd-user: Don't reset X86CPU twice
target-i386: Pass X86CPU to cpu_x86_set_a20()
target-unicore32: Rename CPU subtypes
target-openrisc: Rename CPU subtypes
target-openrisc: TYPE_OPENRISC_CPU should be abstract
target-m68k: Rename CPU subtypes
target-m68k: Mark as unmigratable
target-s390x: Mark as unmigratable
target-sh4: Mark as unmigratable
target-xtensa: Mark as unmigratable
target-microblaze: Mark as unmigratable
target-unicore32: Mark as unmigratable
ide/mmio: QOM'ify MMIO IDE for R2D
Diffstat (limited to 'target-unicore32/Makefile.objs')
| -rw-r--r-- | target-unicore32/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-unicore32/Makefile.objs b/target-unicore32/Makefile.objs index 8e143da937..6b41b1e9ef 100644 --- a/target-unicore32/Makefile.objs +++ b/target-unicore32/Makefile.objs @@ -1,4 +1,4 @@ obj-y += translate.o op_helper.o helper.o cpu.o obj-y += ucf64_helper.o -obj-$(CONFIG_SOFTMMU) += machine.o softmmu.o +obj-$(CONFIG_SOFTMMU) += softmmu.o |