diff options
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 4 | ||||
| -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 |
7 files changed, 30 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index ee3867a16..bd5dc9e5c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -405,10 +405,10 @@ bulk: echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ if [ "x$$p" = xy ];then \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ allmodconfig; \ else \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ defconfig; \ fi && \ $(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \ diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 970120270..79cb7f9cc 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -53,8 +53,12 @@ compile: $(LINUX_DIR)/vmlinux install: compile ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET}-modules-install +ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) + $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) +else $(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg))) endif +endif clean: rm -rf $(LINUX_BUILD_DIR) 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 |