From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 27 May 2009 16:20:21 +0000 (+0000)
Subject: include missing atm-tools to setup pppoe/a links
X-Git-Tag: reboot~23421
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33f6145c51a85d948dbbdf8adcd287ad01ecf3ca;p=oweals%2Fopenwrt.git

include missing atm-tools to setup pppoe/a links

SVN-Revision: 16112
---

diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index a78c703f41..67334cc5fe 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -15,8 +15,8 @@ LINUX_VERSION:=2.6.27.22
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES+= kmod-pppoa ppp-mod-pppoa br2684ctl kmod-acx \
-		kmod-sangam-atm-annex-a kmod-sangam-atm-annex-b
+DEFAULT_PACKAGES+= kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl \
+		kmod-acx kmod-sangam-atm-annex-a kmod-sangam-atm-annex-b
 
 define Target/Description
 	Build firmware images for TI AR7 based routers
diff --git a/target/linux/ar7/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c
index 3448fd2626..f54aedc2a4 100644
--- a/target/linux/ar7/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7/files/arch/mips/ar7/setup.c
@@ -19,6 +19,9 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/pm.h>
+#include <linux/console.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
 
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -69,7 +72,40 @@ const char *get_system_type(void)
 
 static int __init ar7_init_console(void)
 {
-	return 0;
+	int res;
+
+	static struct uart_port uart_port[2];
+
+	memset(uart_port, 0, sizeof(struct uart_port) * 2);
+
+	uart_port[0].type = PORT_AR7;
+	uart_port[0].line = 0;
+	uart_port[0].irq = AR7_IRQ_UART0;
+	uart_port[0].uartclk = ar7_bus_freq() / 2;
+	uart_port[0].iotype = UPIO_MEM;
+	uart_port[0].mapbase = AR7_REGS_UART0;
+	uart_port[0].membase = ioremap(uart_port[0].mapbase, 256);
+	uart_port[0].regshift = 2;
+	res = early_serial_setup(&uart_port[0]);
+	if (res)
+		return res;
+
+	/* Only TNETD73xx have a second serial port */
+	if (ar7_has_second_uart()) {
+		uart_port[1].type = PORT_AR7;
+		uart_port[1].line = 1;
+		uart_port[1].irq = AR7_IRQ_UART1;
+		uart_port[1].uartclk = ar7_bus_freq() / 2;
+		uart_port[1].iotype = UPIO_MEM;
+		uart_port[1].mapbase = UR8_REGS_UART1;
+		uart_port[1].membase = ioremap(uart_port[1].mapbase, 256);
+		uart_port[1].regshift = 2;
+		res = early_serial_setup(&uart_port[1]);
+		if (res)
+			return res;
+	}
+
+	return add_preferred_console("ttyS", 0, NULL);
 }
 
 /*