mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
brcm47xx: fix compile problem when serial is deactivated.
Thank you Andrey SVN-Revision: 24885
This commit is contained in:
parent
4b8799280f
commit
d6af00c555
@ -24,19 +24,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
#include <asm/bootinfo.h>
|
#include <asm/bootinfo.h>
|
||||||
#include <asm/reboot.h>
|
#include <asm/reboot.h>
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
@@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct
|
@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
|
||||||
|
return 0;
|
||||||
void __init plat_mem_setup(void)
|
|
||||||
{
|
|
||||||
- int err;
|
|
||||||
+ int i, err;
|
|
||||||
char buf[100];
|
|
||||||
struct ssb_mipscore *mcore;
|
|
||||||
|
|
||||||
@@ -191,6 +193,24 @@ void __init plat_mem_setup(void)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SERIAL_8250
|
||||||
|
+static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore)
|
||||||
|
+{
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
|
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
|
||||||
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
||||||
+ struct uart_port s;
|
+ struct uart_port s;
|
||||||
@ -54,6 +50,19 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
+ early_serial_setup(&s);
|
+ early_serial_setup(&s);
|
||||||
+ }
|
+ }
|
||||||
+ printk(KERN_DEBUG "Serial init done.\n");
|
+ printk(KERN_DEBUG "Serial init done.\n");
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
void __init plat_mem_setup(void)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
@@ -191,6 +218,10 @@ void __init plat_mem_setup(void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SERIAL_8250
|
||||||
|
+ bcm47xx_early_serial_setup(mcore);
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
_machine_restart = bcm47xx_machine_restart;
|
_machine_restart = bcm47xx_machine_restart;
|
||||||
_machine_halt = bcm47xx_machine_halt;
|
_machine_halt = bcm47xx_machine_halt;
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
+EXPORT_SYMBOL(nvram_get);
|
+EXPORT_SYMBOL(nvram_get);
|
||||||
--- a/arch/mips/bcm47xx/setup.c
|
--- a/arch/mips/bcm47xx/setup.c
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
+++ b/arch/mips/bcm47xx/setup.c
|
||||||
@@ -215,3 +215,20 @@ void __init plat_mem_setup(void)
|
@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
|
||||||
_machine_halt = bcm47xx_machine_halt;
|
_machine_halt = bcm47xx_machine_halt;
|
||||||
pm_power_off = bcm47xx_machine_halt;
|
pm_power_off = bcm47xx_machine_halt;
|
||||||
}
|
}
|
||||||
|
@ -24,19 +24,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
#include <asm/bootinfo.h>
|
#include <asm/bootinfo.h>
|
||||||
#include <asm/reboot.h>
|
#include <asm/reboot.h>
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
@@ -168,7 +170,7 @@ static int bcm47xx_get_invariants(struct
|
@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
|
||||||
|
return 0;
|
||||||
void __init plat_mem_setup(void)
|
|
||||||
{
|
|
||||||
- int err;
|
|
||||||
+ int i, err;
|
|
||||||
char buf[100];
|
|
||||||
struct ssb_mipscore *mcore;
|
|
||||||
|
|
||||||
@@ -191,6 +193,24 @@ void __init plat_mem_setup(void)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SERIAL_8250
|
||||||
|
+static void __init bcm47xx_early_serial_setup(struct ssb_mipscore *mcore)
|
||||||
|
+{
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
|
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
|
||||||
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
||||||
+ struct uart_port s;
|
+ struct uart_port s;
|
||||||
@ -54,6 +50,19 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
+ early_serial_setup(&s);
|
+ early_serial_setup(&s);
|
||||||
+ }
|
+ }
|
||||||
+ printk(KERN_DEBUG "Serial init done.\n");
|
+ printk(KERN_DEBUG "Serial init done.\n");
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
void __init plat_mem_setup(void)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
@@ -191,6 +218,10 @@ void __init plat_mem_setup(void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SERIAL_8250
|
||||||
|
+ bcm47xx_early_serial_setup(mcore);
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
_machine_restart = bcm47xx_machine_restart;
|
_machine_restart = bcm47xx_machine_restart;
|
||||||
_machine_halt = bcm47xx_machine_halt;
|
_machine_halt = bcm47xx_machine_halt;
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
+EXPORT_SYMBOL(nvram_get);
|
+EXPORT_SYMBOL(nvram_get);
|
||||||
--- a/arch/mips/bcm47xx/setup.c
|
--- a/arch/mips/bcm47xx/setup.c
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
+++ b/arch/mips/bcm47xx/setup.c
|
||||||
@@ -215,3 +215,20 @@ void __init plat_mem_setup(void)
|
@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
|
||||||
_machine_halt = bcm47xx_machine_halt;
|
_machine_halt = bcm47xx_machine_halt;
|
||||||
pm_power_off = bcm47xx_machine_halt;
|
pm_power_off = bcm47xx_machine_halt;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user