more danube 2 ifxmips transitions

[openwrt.git] / target / linux / ifxmips / files / arch / mips / danube / prom.c

diff --git a/target/linux/ifxmips/files/arch/mips/danube/prom.c b/target/linux/ifxmips/files/arch/mips/danube/prom.c
index efb0612..317a23c 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/danube/prom.c
+++ b/target/linux/ifxmips/files/arch/mips/danube/prom.c
@@ -1,5 +1,5 @@
 /*
- *   arch/mips/danube/prom.c
+ *   arch/mips/ifxmips/prom.c
  *
  *   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
@@ -17,7 +17,7 @@
  *
  *   Copyright (C) 2005 Wu Qi Ming infineon
  *
- *   Rewrite of Infineon Danube code, thanks to infineon for the support,
+ *   Rewrite of Infineon IFXMips code, thanks to infineon for the support,
  *   software and hardware
  *
  *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
@@ -27,7 +27,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <asm/bootinfo.h>
-#include <asm/danube/danube.h>
+#include <asm/ifxmips/ifxmips.h>
 
 static char buf[1024];
 
@@ -45,11 +45,11 @@ get_system_type (void)
 void
 prom_putchar (char c)
 {
-       while ((readl(DANUBE_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
+       while ((readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
 
        if (c == '\n')
-               writel('\r', DANUBE_ASC1_TBUF);
-       writel(c, DANUBE_ASC1_TBUF);
+               writel('\r', IFXMIPS_ASC1_TBUF);
+       writel(c, IFXMIPS_ASC1_TBUF);
 }
 
 void
@@ -73,8 +73,8 @@ prom_printf (const char * fmt, ...)
 void __init
 prom_init(void)
 {
-       mips_machgroup = MACH_GROUP_DANUBE;
-       mips_machtype = MACH_INFINEON_DANUBE;
+       mips_machgroup = MACH_GROUP_IFXMIPS;
+       mips_machtype = MACH_INFINEON_IFXMIPS;
 
        strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit");
        add_memory_region (0x00000000, 0x2000000, BOOT_MEM_RAM);