diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
| commit | cfc200714ddfa6d76feb836c258b1135d91a8348 (patch) | |
| tree | ecc4628fc161de5044c9acb03bb63b2fd48ae75c /target/ag241 | |
| parent | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff) | |
| parent | 91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/digitemp/Makefile
Diffstat (limited to 'target/ag241')
| -rw-r--r-- | target/ag241/Makefile | 2 | ||||
| -rw-r--r-- | target/ag241/patches/ar7.patch | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/target/ag241/Makefile b/target/ag241/Makefile index 9848205cc..f6bba9c85 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch index 8b28e854c..ef48019d4 100644 --- a/target/ag241/patches/ar7.patch +++ b/target/ag241/patches/ar7.patch @@ -149,3 +149,21 @@ diff -Nur linux-2.6.32.orig/drivers/serial/8250.c linux-2.6.32/drivers/serial/82 serial_out(up, UART_TX, ch); } +diff -Nur linux-2.6.32.orig/arch/mips/ar7/prom.c linux-2.6.32/arch/mips/ar7/prom.c +--- linux-2.6.32.orig/arch/mips/ar7/prom.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/mips/ar7/prom.c 2010-01-05 20:39:11.000000000 +0100 +@@ -219,14 +219,6 @@ + if (strstr(prom_getcmdline(), "console=")) + return; + +-#ifdef CONFIG_KGDB +- if (!strstr(prom_getcmdline(), "nokgdb")) { +- strcat(prom_getcmdline(), " console=kgdb"); +- kgdb_enabled = 1; +- return; +- } +-#endif +- + s = prom_getenv("modetty0"); + if (s) { + baud = simple_strtoul(s, &p, 10); |