Commit ae5045ae authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ffb5a69c e671711c

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -187,6 +187,14 @@ F: disas/moxie.c 
F: hw/moxie/

F: default-configs/moxie-softmmu.mak



NiosII

M: Chris Wulff <crwulff@gmail.com>

M: Marek Vasut <marex@denx.de>

S: Maintained

F: target/nios2/

F: hw/nios2/

F: disas/nios2.c



OpenRISC

M: Jia Liu <proljc@gmail.com>

S: Maintained

arch_init.c

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ int graphic_depth = 32; 
#define QEMU_ARCH QEMU_ARCH_MIPS

#elif defined(TARGET_MOXIE)

#define QEMU_ARCH QEMU_ARCH_MOXIE

#elif defined(TARGET_NIOS2)

#define QEMU_ARCH QEMU_ARCH_NIOS2

#elif defined(TARGET_OPENRISC)

#define QEMU_ARCH QEMU_ARCH_OPENRISC

#elif defined(TARGET_PPC)

configure

+5 −0
Original line number Diff line number Diff line
@@ -5935,6 +5935,8 @@ case "$target_name" in 
  ;;

  moxie)

  ;;

  nios2)

  ;;

  or32)

    TARGET_ARCH=openrisc

    TARGET_BASE_ARCH=openrisc
@@ -6140,6 +6142,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do 
  moxie*)

    disas_config "MOXIE"

  ;;

  nios2)

    disas_config "NIOS2"

  ;;

  or32)

    disas_config "OPENRISC"

  ;;

default-configs/nios2-linux-user.mak

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Default configuration for nios2-linux-user

default-configs/nios2-softmmu.mak

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Default configuration for nios2-softmmu



CONFIG_NIOS2=y

CONFIG_SERIAL=y

CONFIG_PTIMER=y

CONFIG_ALTERA_TIMER=y