12 files changed, 32 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 037a2e710059..84a1f64984b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ linux (3.15.2-1) UNRELEASED; urgency=medium
   * New upstream stable update:
     https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.15.2
 
+  [ Yunqiang Su ]
+  * [mips/mipsel] Move common MIPS kernel config files to kernelarch-mips.
+
  -- maximilian attems <maks@debian.org>  Sat, 21 Jun 2014 14:58:01 +0200
 
 linux (3.15.1-1~exp1) experimental; urgency=medium
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index b3cc474d3737..b3cc474d3737 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 70bda5b9dfac..70bda5b9dfac 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
diff --git a/debian/config/mipsel/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index 843d667b55df..843d667b55df 100644
--- a/debian/config/mipsel/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
diff --git a/debian/config/mipsel/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index 6dd2ae361f63..6dd2ae361f63 100644
--- a/debian/config/mipsel/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
diff --git a/debian/config/mipsel/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 9184f83fc3a1..9184f83fc3a1 100644
--- a/debian/config/mipsel/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
diff --git a/debian/config/mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index f0273903f5a8..f0273903f5a8 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/kernelarch-mips/config.r4k-ip22
index f3872f7fac06..f3872f7fac06 100644
--- a/debian/config/mips/config.r4k-ip22
+++ b/debian/config/kernelarch-mips/config.r4k-ip22
diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/kernelarch-mips/config.r5k-ip32
index 762dc612b5ff..762dc612b5ff 100644
--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/kernelarch-mips/config.r5k-ip32
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/kernelarch-mips/config.sb1-bcm91250a
index c40bcc470c2e..c40bcc470c2e 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/kernelarch-mips/config.sb1-bcm91250a
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index 80a168ef846d..f83aa51befe8 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -18,22 +18,40 @@ install-stem: vmlinux
 hardware: SGI IP22
 hardware-long: SGI IP22 systems (Indy, Indigo2)
 
+[r4k-ip22_image]
+configs: kernelarch-mips/config.r4k-ip22
+
 [r5k-ip32_description]
 hardware: SGI IP32
 hardware-long: SGI IP32 systems (O2)
 
+[r5k-ip32_image]
+configs: kernelarch-mips/config.r5k-ip32
+
 [sb1-bcm91250a_description]
 hardware: BCM91250A
 hardware-long: Broadcom BCM91250A systems (aka SWARM)
 
+[sb1-bcm91250a_image]
+configs: kernelarch-mips/config.sb1-bcm91250a
+
 [4kc-malta_description]
 hardware: MIPS Malta
 hardware-long: MIPS Malta boards
 
+[4kc-malta_image]
+configs: kernelarch-mips/config.4kc-malta
+
 [5kc-malta_description]
 hardware: MIPS Malta (64-bit)
 hardware-long: MIPS Malta boards (64-bit)
 
+[5kc-malta_image]
+configs: kernelarch-mips/config.5kc-malta
+
 [octeon_description]
 hardware: Octeon
 hardware-long: Cavium Networks Octeon
+
+[octeon_image]
+configs: kernelarch-mips/config.octeon
diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines
index 1cd75703aa4c..3750cd322dfb 100644
--- a/debian/config/mipsel/defines
+++ b/debian/config/mipsel/defines
@@ -19,33 +19,41 @@ hardware: BCM91250A
 hardware-long: Broadcom BCM91250A systems (aka SWARM)
 
 [sb1-bcm91250a_image]
-configs: mips/config.sb1-bcm91250a
+configs: kernelarch-mips/config.sb1-bcm91250a
 
 [4kc-malta_description]
 hardware: MIPS Malta
 hardware-long: MIPS Malta boards
 
 [4kc-malta_image]
-configs: mips/config.4kc-malta
+configs: kernelarch-mips/config.4kc-malta
 
 [5kc-malta_description]
 hardware: MIPS Malta (64-bit)
 hardware-long: MIPS Malta boards (64-bit)
 
 [5kc-malta_image]
-configs: mips/config.5kc-malta
+configs: kernelarch-mips/config.5kc-malta
 
 [loongson-2e_description]
 hardware: Loongson 2E
 hardware-long: Lemote Loongson 2E systems
 
+[loongson-2e_image]
+configs: kernelarch-mips/config.loongson-2e
+
 [loongson-2f_description]
 hardware: Loongson 2F
 hardware-long: Lemote Loongson 2F systems
 
 [loongson-2f_image]
 recommends: libc6-loongson2f
+configs: kernelarch-mips/config.loongson-2f
 
 [loongson-3_description]
 hardware: Loongson 3A/3B
 hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
+
+[loongson-3_image]
+configs: kernelarch-mips/config.loongson-3
+