[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 7/7] nios2: Add support for Nios-II R1
From: |
Marek Vasut |
Subject: |
[Qemu-devel] [PATCH V4 7/7] nios2: Add support for Nios-II R1 |
Date: |
Sat, 31 Dec 2016 14:22:26 +0100 |
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 <address@hidden>
Cc: Chris Wulff <address@hidden>
Cc: Jeff Da Silva <address@hidden>
Cc: Ley Foon Tan <address@hidden>
Cc: Sandra Loosemore <address@hidden>
Cc: Yves Vandervennet <address@hidden>
---
V3: Checkpatch cleanup
V4: Rebase on top of qemu/master
---
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 585cd5a..aa7f8fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,14 @@ F: disas/moxie.c
F: hw/moxie/
F: default-configs/moxie-softmmu.mak
+NiosII
+M: Chris Wulff <address@hidden>
+M: Marek Vasut <address@hidden>
+S: Maintained
+F: target/nios2/
+F: hw/nios2/
+F: disas/nios2.c
+
OpenRISC
M: Jia Liu <address@hidden>
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 218df87..81604f1 100755
--- a/configure
+++ b/configure
@@ -5935,6 +5935,8 @@ case "$target_name" in
;;
moxie)
;;
+ nios2)
+ ;;
or32)
TARGET_ARCH=openrisc
TARGET_BASE_ARCH=openrisc
@@ -6128,6 +6130,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 02cb39d..672ed3a 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2891,6 +2891,9 @@ The binary format is detected automatically.
@command{qemu-mips} TODO.
@command{qemu-mipsel} TODO.
address@hidden user mode (NiosII)
address@hidden TODO.
+
@cindex user mode (PowerPC)
@command{qemu-ppc64abi32} TODO.
@command{qemu-ppc64} TODO.
--
2.10.2
- [Qemu-devel] [PATCH V3 1/7] nios2: Add disas entries, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V4 4/7] nios2: Add IIC interrupt controller emulation, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V4 5/7] nios2: Add periodic timer emulation, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V8 2/7] nios2: Add architecture emulation support, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V4 3/7] nios2: Add usermode binaries emulation, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V5 6/7] nios2: Add Altera 10M50 GHRD emulation, Marek Vasut, 2016/12/31
- [Qemu-devel] [PATCH V4 7/7] nios2: Add support for Nios-II R1,
Marek Vasut <=