From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwcHx-0002UN-F1 for qemu-devel@nongnu.org; Tue, 18 Oct 2016 17:51:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwcHw-00042l-Ij for qemu-devel@nongnu.org; Tue, 18 Oct 2016 17:51:13 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:36875) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwcHw-00041C-7H for qemu-devel@nongnu.org; Tue, 18 Oct 2016 17:51:12 -0400 From: Marek Vasut Date: Tue, 18 Oct 2016 23:50:31 +0200 Message-Id: <20161018215031.2575-7-marex@denx.de> In-Reply-To: <20161018215031.2575-1-marex@denx.de> References: <20161018215031.2575-1-marex@denx.de> Subject: [Qemu-devel] [PATCH V3 7/7] nios2: Add support for Nios-II R1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Richard Henderson , Marek Vasut , Chris Wulff , Jeff Da Silva , Ley Foon Tan , Sandra Loosemore , Yves Vandervennet Add remaining bits of the Altera NiosII R1 support into qemu, which is documentation, MAINTAINERS file entry, configure bits, arch_init and configuration files for both linux-user (userland binaries) and softmmu (hardware emulation). Signed-off-by: Marek Vasut Cc: Chris Wulff Cc: Jeff Da Silva Cc: Ley Foon Tan Cc: Sandra Loosemore Cc: Yves Vandervennet --- V3: Checkpatch cleanup --- MAINTAINERS | 8 ++++++++ arch_init.c | 2 ++ configure | 5 +++++ default-configs/nios2-linux-user.mak | 1 + default-configs/nios2-softmmu.mak | 6 ++++++ include/sysemu/arch_init.h | 1 + qemu-doc.texi | 3 +++ 7 files changed, 26 insertions(+) create mode 100644 default-configs/nios2-linux-user.mak create mode 100644 default-configs/nios2-softmmu.mak diff --git a/MAINTAINERS b/MAINTAINERS index b01fec0..d423cf6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -168,6 +168,14 @@ F: disas/moxie.c F: hw/moxie/ F: default-configs/moxie-softmmu.mak +NiosII +M: Chris Wulff +M: Marek Vasut +S: Maintained +F: target-nios2/ +F: hw/nios2/ +F: disas/nios2.c + OpenRISC M: Jia Liu S: Maintained diff --git a/arch_init.c b/arch_init.c index 5cc58b2..20d83ff 100644 --- a/arch_init.c +++ b/arch_init.c @@ -64,6 +64,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) diff --git a/configure b/configure index dd9e679..a3ff3dc 100755 --- a/configure +++ b/configure @@ -5758,6 +5758,8 @@ case "$target_name" in ;; moxie) ;; + nios2) + ;; or32) TARGET_ARCH=openrisc TARGET_BASE_ARCH=openrisc @@ -5951,6 +5953,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do moxie*) disas_config "MOXIE" ;; + nios2) + disas_config "NIOS2" + ;; or32) disas_config "OPENRISC" ;; diff --git a/default-configs/nios2-linux-user.mak b/default-configs/nios2-linux-user.mak new file mode 100644 index 0000000..5be3eb7 --- /dev/null +++ b/default-configs/nios2-linux-user.mak @@ -0,0 +1 @@ +# Default configuration for nios2-linux-user diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak new file mode 100644 index 0000000..74dc70c --- /dev/null +++ b/default-configs/nios2-softmmu.mak @@ -0,0 +1,6 @@ +# Default configuration for nios2-softmmu + +CONFIG_NIOS2=y +CONFIG_SERIAL=y +CONFIG_PTIMER=y +CONFIG_ALTERA_TIMER=y diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 1c9dad1..fe60e11 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -23,6 +23,7 @@ enum { QEMU_ARCH_UNICORE32 = (1 << 14), QEMU_ARCH_MOXIE = (1 << 15), QEMU_ARCH_TRICORE = (1 << 16), + QEMU_ARCH_NIOS2 = (1 << 17), }; extern const uint32_t arch_type; diff --git a/qemu-doc.texi b/qemu-doc.texi index 023c140..f4654a7 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2860,6 +2860,9 @@ The binary format is detected automatically. @command{qemu-mips} TODO. @command{qemu-mipsel} TODO. +@cindex user mode (NiosII) +@command{qemu-nios2} TODO. + @cindex user mode (PowerPC) @command{qemu-ppc64abi32} TODO. @command{qemu-ppc64} TODO. -- 2.9.3