diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
index 17cb740b3f0063d661544b5e288e337ef0d58d29..10dc09da426f9620b83c42a4d21fd61d805fce1a 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
@@ -38,33 +38,26 @@
#include <asm/mips-boards/prom.h>
-#warning FIXME: use sdram control regs and/or autodetection
static int __init memsize(void)
{
- char *memsize_str;
- unsigned int result;
- char cmdline[CL_SIZE], *ptr;
-
- /* Check the command line first for a memsize directive */
- strcpy(cmdline, arcs_cmdline);
- ptr = strstr(cmdline, "memsize=");
- if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
- ptr = strstr(ptr, " memsize=");
-
- if (ptr) {
- result = memparse(ptr + 8, &ptr);
- } else {
- /* otherwise look in the environment */
- memsize_str = prom_getenv("memsize");
- if (!memsize_str) {
- prom_printf("memsize not set in boot prom, set to default (8Mb)\n");
- result = 0x00800000;
- } else {
- result = simple_strtol(memsize_str, NULL, 0);
- }
+ u32 size = (64 << 20);
+ volatile u32 *addr = (u32 *)KSEG1ADDR(0x14000000 + size - 4);
+ u32 *kernel_end = (u32 *)KSEG1ADDR(CPHYSADDR((u32)&_end));
+
+ while (addr > kernel_end) {
+ *addr = (u32)addr;
+ size >>= 1;
+ addr -= size >> 2;
}
- return result;
+ do {
+ addr += size >> 2;
+ if (*addr != (u32)addr)
+ break;
+ size <<= 1;
+ } while (size < (64 << 20));
+
+ return size;
}
#ifdef CONFIG_NEED_MULTIPLE_NODES
@@ -167,9 +160,10 @@ void __init mem_init(void)
void __init prom_meminit(void)
{
+ unsigned long pages;
#ifdef CONFIG_NEED_MULTIPLE_NODES
unsigned long kernel_start, kernel_end;
- unsigned long pages, free_pages;
+ unsigned long free_pages;
unsigned long bootmap_size;
#endif
@@ -196,7 +190,5 @@ void __init prom_meminit(void)
unsigned long __init prom_free_prom_memory(void)
{
-/* return freed;
-*/
return 0;
}
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/platform.c b/target/linux/ar7-2.6/files/arch/mips/ar7/platform.c
index ea170edc6af4f0ac327d78b527145655d1736b5b..c61e20a6c156dbea43e20b5e4de683cd7e2a42dd 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/platform.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/platform.c
@@ -321,7 +321,7 @@ static int __init ar7_register_devices(void)
memset(uart_port, 0, sizeof(struct uart_port) * 2);
- uart_port[0].type = PORT_16750;
+ 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;
@@ -333,7 +333,7 @@ static int __init ar7_register_devices(void)
if (res)
return res;
- uart_port[1].type = PORT_16750;
+ 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;
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 4db4303822b8542b12081faaf809ad8ed7d12378..7176be30220aab37c3cdb7220d9b0ef70a78297e 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -258,7 +258,7 @@ char prom_getchar(void)
int prom_putchar(char c)
{
- while ((serial_in(UART_LSR) & UART_LSR_THRE) == 0);
+ while ((serial_in(UART_LSR) & UART_LSR_TEMT) == 0);
serial_out(UART_TX, c);
return 1;
}
diff --git a/target/linux/ar7-2.6/patches/500-serial_kludge.patch b/target/linux/ar7-2.6/patches/500-serial_kludge.patch
index b6079517d87954bd170c3194ac549c7422be0213..959c5cfe4c9d2fa8e51ef55a77bca25869da4dbd 100644
--- a/target/linux/ar7-2.6/patches/500-serial_kludge.patch
+++ b/target/linux/ar7-2.6/patches/500-serial_kludge.patch
@@ -1,22 +1,52 @@
+diff -Nru linux-2.6.19.2/include/linux/serialP.h linux-ar7/include/linux/serialP.h
+--- linux-2.6.19.2/include/linux/serialP.h 2007-01-17 01:24:01.000000000 +0700
++++ linux-ar7/include/linux/serialP.h 2007-03-22 22:36:48.000000000 +0700
+@@ -135,6 +135,9 @@
+ * the interrupt line _up_ instead of down, so if we register the IRQ
+ * while the UART is in that state, we die in an IRQ storm. */
+ #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
++#elif defined(CONFIG_AR7)
++/* This is how it is set up by bootloader... */
++#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR)
+ #else
+ #define ALPHA_KLUDGE_MCR 0
+ #endif
+diff -Nru linux-2.6.19.2/include/linux/serial_core.h linux-ar7/include/linux/serial_core.h
+--- linux-2.6.19.2/include/linux/serial_core.h 2007-01-11 02:10:37.000000000 +0700
++++ linux-ar7/include/linux/serial_core.h 2007-03-22 22:50:13.000000000 +0700
+@@ -39,7 +39,8 @@
+ #define PORT_RSA 13
+ #define PORT_NS16550A 14
+ #define PORT_XSCALE 15
+-#define PORT_MAX_8250 15 /* max port ID */
++#define PORT_AR7 16
++#define PORT_MAX_8250 16 /* max port ID */
+
+ /*
+ * ARM specific type numbers. These are not currently guaranteed
diff -Nru linux-2.6.19.2/drivers/serial/8250.c linux-ar7/drivers/serial/8250.c
---- linux-2.6.19.2/drivers/serial/8250.c 2006-12-12 02:32:53.000000000 +0700
-+++ linux-ar7/drivers/serial/8250.c 2007-02-02 14:25:51.000000000 +0700
-@@ -2171,6 +2171,9 @@
- */
- up->mcr_mask = ~ALPHA_KLUDGE_MCR;
- up->mcr_force = ALPHA_KLUDGE_MCR;
-+#ifdef CONFIG_AR7
-+ up->mcr_force |= UART_MCR_RTS;
-+#endif
+--- linux-2.6.19.2/drivers/serial/8250.c 2007-01-11 02:10:37.000000000 +0700
++++ linux-ar7/drivers/serial/8250.c 2007-03-22 22:45:17.000000000 +0700
+@@ -251,6 +251,13 @@
+ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+ .flags = UART_CAP_FIFO | UART_CAP_UUE,
+ },
++ [PORT_AR7] = {
++ .name = "TI-AR7",
++ .fifo_size = 16,
++ .tx_loadsz = 16,
++ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
++ .flags = UART_CAP_FIFO | UART_CAP_AFE,
++ },
+ };
- up->port.ops = &serial8250_pops;
- }
-@@ -2243,7 +2246,7 @@
+ #ifdef CONFIG_SERIAL_8250_AU1X00
+@@ -2243,7 +2250,7 @@
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
- wait_for_xmitr(up, UART_LSR_THRE);
-+ wait_for_xmitr(up, UART_LSR_TEMT);
++ wait_for_xmitr(up, BOTH_EMPTY);
serial_out(up, UART_TX, ch);
}