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 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/mips/kernel')
| -rw-r--r-- | target/mips/kernel/lemote-yeelong | 18 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips | 1 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 9 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64el | 9 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mipsel | 7 |
5 files changed, 0 insertions, 44 deletions
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong deleted file mode 100644 index 96ca64c66..000000000 --- a/target/mips/kernel/lemote-yeelong +++ /dev/null @@ -1,18 +0,0 @@ -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/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index ca7b79eb9..422170fbb 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,6 +3,5 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CPU_MIPS32_R1=y -CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y 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 diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el deleted file mode 100644 index 9216fe380..000000000 --- a/target/mips/kernel/qemu-mips64el +++ /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 diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel deleted file mode 100644 index 422170fbb..000000000 --- a/target/mips/kernel/qemu-mipsel +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_MIPS=y -CONFIG_MIPS_MALTA=y -CONFIG_MIPS_BONITO64=y -CONFIG_MIPS_MSC=y -CONFIG_CPU_MIPS32_R1=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y |