diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-07 19:39:15 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-07 19:39:15 +0100 |
| commit | 18fb96ec0fffc0ac2bf76da03677f33285cc8565 (patch) | |
| tree | 603874d0cd05d545a66d7e3d9e29c1b86a0be1d4 /target | |
| parent | 3a3231074b51935ab9385be7f8e0755941cdb484 (diff) | |
| parent | cdff04e2515a2126b2d22a774863e34e29567963 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/ag241/patches/ar7.patch | 18 | ||||
| -rw-r--r-- | target/bulk.lst | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.crypto | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 2 |
5 files changed, 24 insertions, 2 deletions
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); diff --git a/target/bulk.lst b/target/bulk.lst index 8017bf310..d4ac932e5 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1 +1,4 @@ +alix1c uclibc nfsroot y +alix1c eglibc nfsroot y alix1c glibc nfsroot y +ag241 uclibc nfsroot y diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index bdad0241f..d9c997b8d 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -67,6 +67,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) default n help Enables support for AHCI Serial ATA. diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 2b90a6028..7d78a594e 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -62,7 +62,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X endmenu menu "OpenBSD Cryptographic framework" -depends on !ADK_LINUX_CRIS_FOXBOARD +depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) config ADK_KPACKAGE_KMOD_OCF_HIFN prompt "kmod-cryptodev-hifn................ hifn engine" diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index d99681204..64a7af06e 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -1,5 +1,5 @@ menu "Network devices support" -depends on !ADK_LINUX_CRIS_FOXBOARD +depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) config ADK_KERNEL_NETDEVICES boolean |