diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-05 08:05:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-05 08:07:07 +0100 |
| commit | 6e6f397916cfc3f214cbd0e184ec1f41a0de8289 (patch) | |
| tree | c5fafb0cfea406230afdce212f817277cb3f4a56 /target/mips64 | |
| parent | 4cc07dabb76d0a66632a32771f885decbaf0252e (diff) | |
mips: cleanup and fix mips{32,64}r6 support
uClibc-ng shared library support will be fixed in next
release of uClibc-ng. Preparation fixes for this.
Diffstat (limited to 'target/mips64')
| -rw-r--r-- | target/mips64/Makefile | 4 | ||||
| -rw-r--r-- | target/mips64/kernel/qemu-mips64 | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/target/mips64/Makefile b/target/mips64/Makefile index 74d281434..ae50d2344 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -12,6 +12,10 @@ QEMU_ARGS:=-M malta QEMU_ARGS+=${ADK_QEMU_ARGS} QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 +ifeq ($(ADK_TARGET_CPU_MIPS64_MIPS64R6),y) +QEMU_ARGS+=-cpu I6400 +endif + # target helper text ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: diff --git a/target/mips64/kernel/qemu-mips64 b/target/mips64/kernel/qemu-mips64 index 9216fe380..1c0076b03 100644 --- a/target/mips64/kernel/qemu-mips64 +++ b/target/mips64/kernel/qemu-mips64 @@ -1,9 +1,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y -CONFIG_CPU_MIPS64_R1=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y CONFIG_BINFMT_ELF32=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y |