aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-06-05 18:26:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-06-05 18:26:45 +0000
commitb730849966321b75268d21d6a0188c858b63c029 (patch)
tree4a1ba5f0024d2d938fb375baec7b6bbe94a4f8c5 /target/linux/generic-2.6
parentac8b72c8c9f737cfa928116d74aace9b38bf9580 (diff)
downloadupstream-b730849966321b75268d21d6a0188c858b63c029.tar.gz
upstream-b730849966321b75268d21d6a0188c858b63c029.tar.bz2
upstream-b730849966321b75268d21d6a0188c858b63c029.zip
generic: update mips multimachine patch
SVN-Revision: 21681
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch31
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch31
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch31
3 files changed, 51 insertions, 42 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
index 2230523c92..d73b2d1523 100644
--- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
@@ -57,7 +57,7 @@
+#endif /* __ASM_MIPS_MACHINE_H */
--- /dev/null
+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
@@ -109,29 +109,32 @@
+ continue;
+
+ if (strcmp(mach->mach_id, id) == 0) {
-+ mips_machine = mach;
-+ break;
++ mips_machtype = mach->mach_type;
++ return 0;
+ }
+ }
+
-+ if (!mips_machine) {
-+ pr_err("MIPS: no machine found for id '%s', supported machines:\n",
-+ id);
-+ pr_err("%32s %s\n", "id", "name");
-+ for_each_machine(mach)
-+ pr_err("%32s %s\n", mach->mach_id, mach->mach_name);
-+ return 1;
-+ }
-+
-+ mips_machtype = mips_machine->mach_type;
++ pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
++ pr_err("%-24s : %s\n", "id", "name");
++ for_each_machine(mach)
++ pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
+
-+ return 0;
++ return 1;
+}
+
+__setup("machtype=", mips_machtype_setup);
+
+__init void mips_machine_setup(void)
+{
++ struct mips_machine *mach;
++
++ for_each_machine(mach) {
++ if (mips_machtype == mach->mach_type) {
++ mips_machine = mach;
++ break;
++ }
++ }
++
+ if (!mips_machine)
+ return;
+
diff --git a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
index 1f25b17efe..111d69b4d9 100644
--- a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
@@ -57,7 +57,7 @@
+#endif /* __ASM_MIPS_MACHINE_H */
--- /dev/null
+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
@@ -109,29 +109,32 @@
+ continue;
+
+ if (strcmp(mach->mach_id, id) == 0) {
-+ mips_machine = mach;
-+ break;
++ mips_machtype = mach->mach_type;
++ return 0;
+ }
+ }
+
-+ if (!mips_machine) {
-+ pr_err("MIPS: no machine found for id '%s', supported machines:\n",
-+ id);
-+ pr_err("%32s %s\n", "id", "name");
-+ for_each_machine(mach)
-+ pr_err("%32s %s\n", mach->mach_id, mach->mach_name);
-+ return 1;
-+ }
-+
-+ mips_machtype = mips_machine->mach_type;
++ pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
++ pr_err("%-24s : %s\n", "id", "name");
++ for_each_machine(mach)
++ pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
+
-+ return 0;
++ return 1;
+}
+
+__setup("machtype=", mips_machtype_setup);
+
+__init void mips_machine_setup(void)
+{
++ struct mips_machine *mach;
++
++ for_each_machine(mach) {
++ if (mips_machtype == mach->mach_type) {
++ mips_machine = mach;
++ break;
++ }
++ }
++
+ if (!mips_machine)
+ return;
+
diff --git a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
index 03c5b158f9..ca0c10b20d 100644
--- a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
@@ -57,7 +57,7 @@
+#endif /* __ASM_MIPS_MACHINE_H */
--- /dev/null
+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
@@ -109,29 +109,32 @@
+ continue;
+
+ if (strcmp(mach->mach_id, id) == 0) {
-+ mips_machine = mach;
-+ break;
++ mips_machtype = mach->mach_type;
++ return 0;
+ }
+ }
+
-+ if (!mips_machine) {
-+ pr_err("MIPS: no machine found for id '%s', supported machines:\n",
-+ id);
-+ pr_err("%32s %s\n", "id", "name");
-+ for_each_machine(mach)
-+ pr_err("%32s %s\n", mach->mach_id, mach->mach_name);
-+ return 1;
-+ }
-+
-+ mips_machtype = mips_machine->mach_type;
++ pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
++ pr_err("%-24s : %s\n", "id", "name");
++ for_each_machine(mach)
++ pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
+
-+ return 0;
++ return 1;
+}
+
+__setup("machtype=", mips_machtype_setup);
+
+__init void mips_machine_setup(void)
+{
++ struct mips_machine *mach;
++
++ for_each_machine(mach) {
++ if (mips_machtype == mach->mach_type) {
++ mips_machine = mach;
++ break;
++ }
++ }
++
+ if (!mips_machine)
+ return;
+