diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 13:30:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-25 13:30:23 +0000 |
| commit | ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf (patch) | |
| tree | 93369341e12120f48c7c7a550fb969578dc5268d /disas/Makefile.objs | |
| parent | ffb5a69c31b3c2a79ad5b4b9a8e47da83eef6115 (diff) | |
| parent | e671711c9a8c1de540f035095e18458bc03968de (diff) | |
| download | qemu-ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf.tar.gz | |
Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging
nios2 target support
# gpg: Signature made Tue 24 Jan 2017 21:11:47 GMT
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-nios-20170124:
nios2: Add support for Nios-II R1
nios2: Add Altera 10M50 GHRD emulation
nios2: Add periodic timer emulation
nios2: Add IIC interrupt controller emulation
nios2: Add usermode binaries emulation
nios2: Add disas entries
nios2: Add architecture emulation support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'disas/Makefile.objs')
| -rw-r--r-- | disas/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/disas/Makefile.objs b/disas/Makefile.objs index abeba84661..62632ef0dd 100644 --- a/disas/Makefile.objs +++ b/disas/Makefile.objs @@ -15,6 +15,7 @@ common-obj-$(CONFIG_IA64_DIS) += ia64.o common-obj-$(CONFIG_M68K_DIS) += m68k.o common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o common-obj-$(CONFIG_MIPS_DIS) += mips.o +common-obj-$(CONFIG_NIOS2_DIS) += nios2.o common-obj-$(CONFIG_MOXIE_DIS) += moxie.o common-obj-$(CONFIG_PPC_DIS) += ppc.o common-obj-$(CONFIG_S390_DIS) += s390.o |