[MIPS] TXx9: Make single kernel can support multiple boards

Make single kernel can be used on RBTX4927/37/38.  Also make
some SoC-specific code independent from board-specific code.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 3 insertions, 49 deletions

diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c
index 0020bbee838b..942e627d2dc1 100644
--- a/arch/mips/txx9/rbtx4927/prom.c
+++ b/arch/mips/txx9/rbtx4927/prom.c
@@ -30,62 +30,16 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
-#include <linux/string.h>
 #include <asm/bootinfo.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/txx9/tx4927.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4927.h>
 
-void __init prom_init_cmdline(void)
-{
-        int argc = (int) fw_arg0;
-        char **argv = (char **) fw_arg1;
-        int i;                  /* Always ignore the "-c" at argv[0] */
-
-        /* ignore all built-in args if any f/w args given */
-        if (argc > 1) {
-                *arcs_cmdline = '\0';
-        }
-
-        for (i = 1; i < argc; i++) {
-                if (i != 1) {
-                        strcat(arcs_cmdline, " ");
-                }
-                strcat(arcs_cmdline, argv[i]);
-        }
-}
-
-void __init prom_init(void)
+void __init rbtx4927_prom_init(void)
 {
         extern int tx4927_get_mem_size(void);
-        extern char* toshiba_name;
         int msize;
 
         prom_init_cmdline();
-
-        if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
-                mips_machtype = MACH_TOSHIBA_RBTX4927;
-                toshiba_name  = "TX4927";
-        } else {
-                mips_machtype = MACH_TOSHIBA_RBTX4937;
-                toshiba_name  = "TX4937";
-        }
-
         msize = tx4927_get_mem_size();
         add_memory_region(0, msize << 20, BOOT_MEM_RAM);
 }
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-const char *get_system_type(void)
-{
-        return "Toshiba RBTX4927/RBTX4937";
-}
-
-char * __init prom_getcmdline(void)
-{
-        return &(arcs_cmdline[0]);
-}
-