adm5120: nuke adm5120_mach_type, use mips_machtype instead

[librecmc/librecmc.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / prom.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
index 4c48dc0be2f2e59c054dc7abe1717b41eab31118..81ba365a0ee5ae07b582439f1ccb7db57bb182d3 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
@@ -13,14 +13,11 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/io.h>
 
 #include <asm/bootinfo.h>
-#include <asm/addrspace.h>
+#include <asm/mips_machine.h>
 
 #include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_uart.h>
 
 #include <prom/cfe.h>
 #include <prom/generic.h>
@@ -67,6 +64,8 @@ static struct board_desc common_boards[] __initdata = {
        DEFBOARD("153",         MACH_ADM5120_RB_153),
        DEFBOARD("192",         MACH_ADM5120_RB_192),
        DEFBOARD("miniROUTER",  MACH_ADM5120_RB_150),
+       /* OSBRiDGE boards */
+       DEFBOARD("OSBRiDGE 5GXi",       MACH_ADM5120_5GXI),
        /* Motorola boards */
        DEFBOARD("Powerline MU Gateway",MACH_ADM5120_PMUGW),
 };
@@ -234,30 +233,22 @@ static void __init prom_detect_machtype(void)
        mips_machtype = MACH_ADM5120_GENERIC;
 }
 
-/* TODO: this is an ugly hack for RouterBOARDS */
-extern char _image_cmdline;
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+extern char __image_cmdline[];
+
 static void __init prom_init_cmdline(void)
 {
        char *cmd;
 
        /* init command line, register a default kernel command line */
-       cmd = &_image_cmdline + 8;
+       cmd = __image_cmdline;
        if (strlen(cmd) > 0)
                strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline));
 
 }
-
-#define UART_READ(r) \
-       __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-#define UART_WRITE(r, v) \
-       __raw_writel((v), (void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-
-void __init prom_putchar(char ch)
-{
-       while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-       UART_WRITE(UART_REG_DATA, ch);
-       while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-}
+#else
+static void inline prom_init_cmdline(void) {}
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
 
 void __init prom_init(void)
 {