projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
306caa6
)
bcm47xx: We can use the ssb-invariants callback now, as was changed to be called...
author
Michael Büsch
<mb@bu3sch.de>
Sun, 17 Feb 2008 13:06:45 +0000
(13:06 +0000)
committer
Michael Büsch
<mb@bu3sch.de>
Sun, 17 Feb 2008 13:06:45 +0000
(13:06 +0000)
SVN-Revision: 10476
target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
patch
|
blob
|
history
diff --git
a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index bd99afaab4d8bd9916270018c2c513fbc2b02b40..008634a7e8f2c2cfb860569027c6a6d619b4114c 100644
(file)
--- a/
target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/
target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@
-87,11
+87,6
@@
static void e_aton(char *str, char *dest)
}
static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
}
static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
-{
- // TODO
-}
-
-static void bcm47xx_fill_sprom_nvram(struct ssb_sprom *sprom)
{
char *s;
{
char *s;
@@
-153,7
+148,9
@@
static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariant
iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
if ((s = nvram_get("boardrev")))
iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
if ((s = nvram_get("boardrev")))
iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
+
bcm47xx_fill_sprom(&iv->sprom);
bcm47xx_fill_sprom(&iv->sprom);
+
return 0;
}
return 0;
}
@@
-171,10
+168,6
@@
void __init plat_mem_setup(void)
}
mcore = &ssb.mipscore;
}
mcore = &ssb.mipscore;
- /* FIXME: the nvram init depends on the ssb being fully initializes,
- * can't use the fill_sprom callback yet! */
- bcm47xx_fill_sprom_nvram(&ssb.sprom);
-
s = nvram_get("kernel_args");
if (s && !strncmp(s, "console=ttyS1", 13)) {
struct ssb_serial_port port;
s = nvram_get("kernel_args");
if (s && !strncmp(s, "console=ttyS1", 13)) {
struct ssb_serial_port port;
@@
-193,7
+186,7
@@
void __init plat_mem_setup(void)
memset(&s, 0, sizeof(s));
s.line = i;
s.membase = port->regs;
memset(&s, 0, sizeof(s));
s.line = i;
s.membase = port->regs;
- s.irq = port->irq + 2;
//FIXME?
+ s.irq = port->irq + 2;
s.uartclk = port->baud_base;
s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
s.iotype = SERIAL_IO_MEM;
s.uartclk = port->baud_base;
s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
s.iotype = SERIAL_IO_MEM;