diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/mips/kernel/qemu-mips64 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/mips/kernel/qemu-mips64')
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 deleted file mode 100644 index 9216fe380..000000000 --- a/target/mips/kernel/qemu-mips64 +++ /dev/null @@ -1,9 +0,0 @@ -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 |