summaryrefslogtreecommitdiff
path: root/target/mips/kernel
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
commit05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch)
treee99502f671b83f6898a77b78f88fdc67be8aa251 /target/mips/kernel
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/mips/kernel')
-rw-r--r--target/mips/kernel/lemote-yeelong3
-rw-r--r--target/mips/kernel/mikrotik-rb5323
-rw-r--r--target/mips/kernel/qemu-mips5
-rw-r--r--target/mips/kernel/qemu-mips645
-rw-r--r--target/mips/kernel/qemu-mips64el7
-rw-r--r--target/mips/kernel/qemu-mipsel6
6 files changed, 0 insertions, 29 deletions
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong
index 412f6f9f8..96ca64c66 100644
--- a/target/mips/kernel/lemote-yeelong
+++ b/target/mips/kernel/lemote-yeelong
@@ -6,14 +6,11 @@ CONFIG_CPU_LOONGSON2F=y
CONFIG_CPU_NOP_WORKAROUNDS=y
CONFIG_CPU_JUMP_WORKAROUNDS=y
CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y
-CONFIG_64BIT=y
CONFIG_PAGE_SIZE_16KB=y
CONFIG_MIPS32_COMPAT=y
CONFIG_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139TOO=y
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
diff --git a/target/mips/kernel/mikrotik-rb532 b/target/mips/kernel/mikrotik-rb532
index 57ef2e1ed..8162e7619 100644
--- a/target/mips/kernel/mikrotik-rb532
+++ b/target/mips/kernel/mikrotik-rb532
@@ -1,8 +1,5 @@
CONFIG_MIPS=y
CONFIG_MIKROTIK_RB532=y
CONFIG_CPU_MIPS32_R1=y
-CONFIG_KORINA=y
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips
index d3129fbda..ca7b79eb9 100644
--- a/target/mips/kernel/qemu-mips
+++ b/target/mips/kernel/qemu-mips
@@ -3,11 +3,6 @@ CONFIG_MIPS_MALTA=y
CONFIG_MIPS_BONITO64=y
CONFIG_MIPS_MSC=y
CONFIG_CPU_MIPS32_R1=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=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
index 3a1be029e..9216fe380 100644
--- a/target/mips/kernel/qemu-mips64
+++ b/target/mips/kernel/qemu-mips64
@@ -1,14 +1,9 @@
CONFIG_MIPS=y
CONFIG_MIPS_MALTA=y
CONFIG_CPU_MIPS64_R1=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
CONFIG_BINFMT_ELF32=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el
index 40192aff2..9216fe380 100644
--- a/target/mips/kernel/qemu-mips64el
+++ b/target/mips/kernel/qemu-mips64el
@@ -1,16 +1,9 @@
CONFIG_MIPS=y
CONFIG_MIPS_MALTA=y
CONFIG_CPU_MIPS64_R1=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
CONFIG_BINFMT_ELF32=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel
index d3129fbda..422170fbb 100644
--- a/target/mips/kernel/qemu-mipsel
+++ b/target/mips/kernel/qemu-mipsel
@@ -3,11 +3,5 @@ CONFIG_MIPS_MALTA=y
CONFIG_MIPS_BONITO64=y
CONFIG_MIPS_MSC=y
CONFIG_CPU_MIPS32_R1=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
-CONFIG_PHYLIB=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y