3 files changed, 54 insertions, 3 deletions

diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 0ed52b3f5314..3799098e1e95 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology
+ * Copyright (C) 2009 Lemote Inc.
  * Author: Wu Zhangjin, wuzj@lemote.com
  *
  * Copyright (c) 2009 Zhang Le <r0bertz@gentoo.org>
@@ -35,6 +35,10 @@ const char *get_system_type(void)
         return system_types[mips_machtype];
 }
 
+void __weak __init mach_prom_init_machtype(void)
+{
+}
+
 void __init prom_init_machtype(void)
 {
         char *p, str[MACHTYPE_LEN];
@@ -43,8 +47,10 @@ void __init prom_init_machtype(void)
         mips_machtype = LOONGSON_MACHTYPE;
 
         p = strstr(arcs_cmdline, "machtype=");
-        if (!p)
+        if (!p) {
+                mach_prom_init_machtype();
                 return;
+        }
         p += strlen("machtype=");
         strncpy(str, p, MACHTYPE_LEN);
         p = strstr(str, " ");
diff --git a/arch/mips/loongson/lemote-2f/Makefile b/arch/mips/loongson/lemote-2f/Makefile
index 4d84b27dc41b..8699a53f0477 100644
--- a/arch/mips/loongson/lemote-2f/Makefile
+++ b/arch/mips/loongson/lemote-2f/Makefile
@@ -2,7 +2,7 @@
 # Makefile for lemote loongson2f family machines
 #
 
-obj-y += irq.o reset.o ec_kb3310b.o
+obj-y += machtype.o irq.o reset.o ec_kb3310b.o
 
 #
 # Suspend Support
diff --git a/arch/mips/loongson/lemote-2f/machtype.c b/arch/mips/loongson/lemote-2f/machtype.c
new file mode 100644
index 000000000000..610f43173148
--- /dev/null
+++ b/arch/mips/loongson/lemote-2f/machtype.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2009 Lemote Inc.
+ * Author: Wu Zhangjin, wuzj@lemote.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <asm/bootinfo.h>
+
+#include <loongson.h>
+
+void __init mach_prom_init_machtype(void)
+{
+        /* We share the same kernel image file among Lemote 2F family
+         * of machines, and provide the machtype= kernel command line
+         * to users to indicate their machine, this command line will
+         * be passed by the latest PMON automatically. and fortunately,
+         * up to now, we can get the machine type from the PMON_VER=
+         * commandline directly except the NAS machine, In the old
+         * machines, this will help the users a lot.
+         *
+         * If no "machtype=" passed, get machine type from "PMON_VER=".
+         *      PMON_VER=LM8089         Lemote 8.9'' netbook
+         *               LM8101         Lemote 10.1'' netbook
+         *      (The above two netbooks have the same kernel support)
+         *               LM6XXX         Lemote FuLoong(2F) box series
+         *               LM9XXX         Lemote LynLoong PC series
+         */
+        if (strstr(arcs_cmdline, "PMON_VER=LM")) {
+                if (strstr(arcs_cmdline, "PMON_VER=LM8"))
+                        mips_machtype = MACH_LEMOTE_YL2F89;
+                else if (strstr(arcs_cmdline, "PMON_VER=LM6"))
+                        mips_machtype = MACH_LEMOTE_FL2F;
+                else if (strstr(arcs_cmdline, "PMON_VER=LM9"))
+                        mips_machtype = MACH_LEMOTE_LL2F;
+                else
+                        mips_machtype = MACH_LEMOTE_NAS;
+
+                strcat(arcs_cmdline, " machtype=");
+                strcat(arcs_cmdline, get_system_type());
+                strcat(arcs_cmdline, " ");
+        }
+}