ar7: Fix volatile usage. Thanks Christopher Pascoe.

[openwrt.git] / target / linux / ar7-2.6 / files / arch / mips / ar7 / prom.c

diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index e613164..00cb4a6 100644 (file)
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <asm/bootinfo.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/io.h>
 #include <asm/bootinfo.h>
 #include <asm/mips-boards/prom.h>

+#include <asm/gdb-stub.h>

 
 #include <asm/ar7/ar7.h>
 
 
 #include <asm/ar7/ar7.h>
 


@@ -107,7 +108,7 @@ static __initdata struct psp_chip_map psp_chip_map[] = {
 
 static struct env_var adam2_env[MAX_ENTRY] = { { 0, }, };
 
 
 static struct env_var adam2_env[MAX_ENTRY] = { { 0, }, };
 

-char * __init prom_getenv(char *name)
+char * prom_getenv(char *name)

 {
        int i;
        for (i = 0; (i < MAX_ENTRY) && adam2_env[i].name; i++)
 {
        int i;
        for (i = 0; (i < MAX_ENTRY) && adam2_env[i].name; i++)


@@ -232,11 +233,56 @@ static void __init ar7_init_env(struct env_var *env)
        }
 }
 
        }
 }
 

+static void __init console_config(void)
+{
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+       char console_string[40];
+       int baud = 0;
+       char parity = '\0', bits = '\0', flow = '\0';
+       char *s, *p;
+
+       if (strstr(prom_getcmdline(), "console="))
+               return;
+
+#ifdef CONFIG_KGDB
+       strcat(prom_getcmdline(), " console=kgdb");
+       prom_printf("Please connect GDB to this port\n");
+       kgdb_enabled = 1;
+       return;
+#endif
+
+       if ((s = prom_getenv("modetty0"))) {
+               baud = simple_strtoul(s, &p, 10);
+               s = p;
+               if (*s == ',') s++;
+               if (*s) parity = *s++;
+               if (*s == ',') s++;
+               if (*s) bits = *s++;
+               if (*s == ',') s++;
+               if (*s == 'h') flow = 'r';
+       }
+
+       if (baud == 0)
+               baud = 38400;
+       if (parity != 'n' && parity != 'o' && parity != 'e')
+               parity = 'n';
+       if (bits != '7' && bits != '8')
+               bits = '8';
+       if (flow == '\0')
+               flow = 'r';
+
+       sprintf(console_string, " console=ttyS0,%d%c%c%c", baud,
+               parity, bits, flow);
+       strcat(prom_getcmdline(), console_string);
+#endif
+}
+

 void __init prom_init(void)
 {
        prom_printf("\nLINUX running...\n");
        ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
        ar7_init_env((struct env_var *)fw_arg2);
 void __init prom_init(void)
 {
        prom_printf("\nLINUX running...\n");
        ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
        ar7_init_env((struct env_var *)fw_arg2);

+       console_config();

 }
 
 #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))
 }
 
 #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))


@@ -263,4 +309,16 @@ int prom_putchar(char c)
        return 1;
 }
 
        return 1;
 }
 

+#ifdef CONFIG_KGDB
+int putDebugChar(char c)
+{
+       return prom_putchar(c);
+}
+
+char getDebugChar(void)
+{
+       return prom_getchar();
+}
+#endif
+

 EXPORT_SYMBOL(prom_getenv);
 EXPORT_SYMBOL(prom_getenv);