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/mips64/kernel | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/mips64/kernel')
-rw-r--r-- | target/mips64/kernel/lemote-yeelong | 18 | ||||
-rw-r--r-- | target/mips64/kernel/qemu-mips64 | 9 |
2 files changed, 27 insertions, 0 deletions
diff --git a/target/mips64/kernel/lemote-yeelong b/target/mips64/kernel/lemote-yeelong new file mode 100644 index 000000000..96ca64c66 --- /dev/null +++ b/target/mips64/kernel/lemote-yeelong @@ -0,0 +1,18 @@ +CONFIG_MIPS=y +CONFIG_MACH_LOONGSON=y +CONFIG_LEMOTE_MACH2F=y +CONFIG_CS5536=y +CONFIG_CPU_LOONGSON2F=y +CONFIG_CPU_NOP_WORKAROUNDS=y +CONFIG_CPU_JUMP_WORKAROUNDS=y +CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y +CONFIG_PAGE_SIZE_16KB=y +CONFIG_MIPS32_COMPAT=y +CONFIG_COMPAT=y +CONFIG_MIPS32_O32=y +CONFIG_MIPS32_N32=y +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y + diff --git a/target/mips64/kernel/qemu-mips64 b/target/mips64/kernel/qemu-mips64 new file mode 100644 index 000000000..9216fe380 --- /dev/null +++ b/target/mips64/kernel/qemu-mips64 @@ -0,0 +1,9 @@ +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 |