qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 05:26:16 +02:00
Code

Use console config from adam2/pspboot environment (#1623).

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7107 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
ejka 2007-05-06 13:30:38 +00:00
parent 162208e606
commit 5df7ea9352
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar7-2.6/config/default
View File

@ -10,7 +10,7 @@ CONFIG_BASE_SMALL=0
# CONFIG_BLK_DEV_INITRD is not set
CONFIG_BOOT_ELF32=y
# CONFIG_BT is not set
CONFIG_CMDLINE="console=ttyS0,38400n8r init=/etc/preinit rootfstype=squashfs,jffs2,"
CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
CONFIG_CPMAC=y
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_HAS_LLSC=y

38
target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
View File

@ -232,11 +232,49 @@ 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;
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);
console_config();
}
#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))