[linux] 01/01: [mips] Set CPU to MIPS32/64 R2.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch master
in repository linux.

commit 550ea781955e7d915aa49b2e90009a1a7b2197a4
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Fri May 20 22:46:51 2016 +0200

    [mips] Set CPU to MIPS32/64 R2.
---
 debian/changelog                    | 1 +
 debian/config/mips/config.4kc-malta | 7 +++++++
 debian/config/mips/config.5kc-malta | 7 +++++++
 debian/config/mips/defines          | 4 ++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fec9494..f7fd597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
 
   [ Aurelien Jarno ]
   * [mips64el] Set CPU to MIPS64 R2.
+  * [mips] Set CPU to MIPS32/64 R2.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 May 2016 23:33:30 +0100
 
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
new file mode 100644
index 0000000..f84e399
--- /dev/null
+++ b/debian/config/mips/config.4kc-malta
@@ -0,0 +1,7 @@
+##
+## file: arch/mips/Kconfig
+##
+## choice: CPU type
+# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R2=y
+## end choice
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
new file mode 100644
index 0000000..6de3974
--- /dev/null
+++ b/debian/config/mips/config.5kc-malta
@@ -0,0 +1,7 @@
+##
+## file: arch/mips/Kconfig
+##
+## choice: CPU type
+# CONFIG_CPU_MIPS64_R1 is not set
+CONFIG_CPU_MIPS64_R2=y
+## end choice
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index 55e0fb7..a86dd03 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -18,14 +18,14 @@ hardware: MIPS Malta
 hardware-long: MIPS Malta boards
 
 [4kc-malta_image]
-configs: kernelarch-mips/config.4kc-malta
+configs: kernelarch-mips/config.4kc-malta 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
+configs: kernelarch-mips/config.5kc-malta mips/config.5kc-malta
 
 [octeon_description]
 hardware: Octeon

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git