• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisione671711c9a8c1de540f035095e18458bc03968de (tree)
Time2017-01-25 06:10:36
AuthorMarek Vasut <marex@denx...>
CommiterRichard Henderson

Log Message

nios2: Add support for Nios-II R1

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 <marex@denx.de>
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Jeff Da Silva <jdasilva@altera.com>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Sandra Loosemore <sandra@codesourcery.com>
Cc: Yves Vandervennet <yvanderv@altera.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Message-Id: <20170118220146.489-8-marex@denx.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>

Change Summary

Incremental Difference

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -187,6 +187,14 @@ F: disas/moxie.c
187187 F: hw/moxie/
188188 F: default-configs/moxie-softmmu.mak
189189
190+NiosII
191+M: Chris Wulff <crwulff@gmail.com>
192+M: Marek Vasut <marex@denx.de>
193+S: Maintained
194+F: target/nios2/
195+F: hw/nios2/
196+F: disas/nios2.c
197+
190198 OpenRISC
191199 M: Jia Liu <proljc@gmail.com>
192200 S: Maintained
--- a/arch_init.c
+++ b/arch_init.c
@@ -63,6 +63,8 @@ int graphic_depth = 32;
6363 #define QEMU_ARCH QEMU_ARCH_MIPS
6464 #elif defined(TARGET_MOXIE)
6565 #define QEMU_ARCH QEMU_ARCH_MOXIE
66+#elif defined(TARGET_NIOS2)
67+#define QEMU_ARCH QEMU_ARCH_NIOS2
6668 #elif defined(TARGET_OPENRISC)
6769 #define QEMU_ARCH QEMU_ARCH_OPENRISC
6870 #elif defined(TARGET_PPC)
--- a/configure
+++ b/configure
@@ -5935,6 +5935,8 @@ case "$target_name" in
59355935 ;;
59365936 moxie)
59375937 ;;
5938+ nios2)
5939+ ;;
59385940 or32)
59395941 TARGET_ARCH=openrisc
59405942 TARGET_BASE_ARCH=openrisc
@@ -6140,6 +6142,9 @@ for i in $ARCH $TARGET_BASE_ARCH ; do
61406142 moxie*)
61416143 disas_config "MOXIE"
61426144 ;;
6145+ nios2)
6146+ disas_config "NIOS2"
6147+ ;;
61436148 or32)
61446149 disas_config "OPENRISC"
61456150 ;;
--- /dev/null
+++ b/default-configs/nios2-linux-user.mak
@@ -0,0 +1 @@
1+# Default configuration for nios2-linux-user
--- /dev/null
+++ b/default-configs/nios2-softmmu.mak
@@ -0,0 +1,6 @@
1+# Default configuration for nios2-softmmu
2+
3+CONFIG_NIOS2=y
4+CONFIG_SERIAL=y
5+CONFIG_PTIMER=y
6+CONFIG_ALTERA_TIMER=y
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -23,6 +23,7 @@ enum {
2323 QEMU_ARCH_UNICORE32 = (1 << 14),
2424 QEMU_ARCH_MOXIE = (1 << 15),
2525 QEMU_ARCH_TRICORE = (1 << 16),
26+ QEMU_ARCH_NIOS2 = (1 << 17),
2627 };
2728
2829 extern const uint32_t arch_type;
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2901,6 +2901,9 @@ The binary format is detected automatically.
29012901 @command{qemu-mips} TODO.
29022902 @command{qemu-mipsel} TODO.
29032903
2904+@cindex user mode (NiosII)
2905+@command{qemu-nios2} TODO.
2906+
29042907 @cindex user mode (PowerPC)
29052908 @command{qemu-ppc64abi32} TODO.
29062909 @command{qemu-ppc64} TODO.