From 43c90eb66af7dab30f7826159688f15f641f95ad Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 7 Jan 2010 16:03:04 +0100 Subject: fix build bug, found by joerg. It seems to be a problem to call PKG_INSTALL via $(shell ..) --- mk/kernel-build.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk') 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) -- cgit v1.2.3 From d6940ecea3ab3e03e4a8623273d4f4fe373f445d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 7 Jan 2010 16:08:59 +0100 Subject: fix ag241 make allmodconfig issues --- mk/build.mk | 4 ++-- target/ag241/patches/ar7.patch | 18 ++++++++++++++++++ target/bulk.lst | 3 +++ target/linux/config/Config.in.block | 1 + target/linux/config/Config.in.crypto | 2 +- target/linux/config/Config.in.netdevice | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) (limited to 'mk') 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/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 -- cgit v1.2.3 From ec4c5a3cb3c732d16e7aa3f0019844675fd425c1 Mon Sep 17 00:00:00 2001 From: Joerg Seitter Date: Fri, 8 Jan 2010 10:49:34 +0100 Subject: added event input kernel module Added support for event input kernel module Signed-off-by: Joerg Seitter --- mk/modules.mk | 4 ++++ target/linux/config/Config.in.input | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 948a68364..f1760baa8 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -979,6 +979,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\ $(MODULES_DIR)/kernel/drivers/input/mousedev \ ,45)) +$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ + $(MODULES_DIR)/kernel/drivers/input/evdev \ +,45)) + # # USB # diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 5f1cffd77..a3afafe0c 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -38,4 +38,10 @@ config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV tristate default n +config ADK_KPACKAGE_KMOD_INPUT_EVDEV + prompt "kmod-input-evdev................. Event support" + select ADK_KERNEL_INPUT + tristate + default n + endmenu -- cgit v1.2.3 From fc602049dadfccb2940d203276e916a24de75763 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 12:41:53 +0100 Subject: add scsi module, when SCSI support is used as kernel module --- mk/modules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index f1760baa8..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ -- cgit v1.2.3 From ed0cbf11579279dd9ea8f33d5b6e387cedc278db Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 12:42:35 +0100 Subject: remove unused stuff. comment debug output. --- mk/image.mk | 3 --- target/foxboard/Makefile | 2 +- target/foxboard/tools/mkfimage/mkfimage.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index ffa6f4152..a21647355 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -12,7 +12,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/mkfimage - $(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE) + $(MAKE) -C tools/e100boot prepare compile install $(MAKE) -C ../tools/squashfs prepare compile install $(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/ diff --git a/target/foxboard/tools/mkfimage/mkfimage.c b/target/foxboard/tools/mkfimage/mkfimage.c index 6904170cf..b1897fbd7 100644 --- a/target/foxboard/tools/mkfimage/mkfimage.c +++ b/target/foxboard/tools/mkfimage/mkfimage.c @@ -37,7 +37,7 @@ int main(int argc, char **argv){ for(loop = 0; loop < (64 * 1024) - sizeof(magic_str); loop++){ if(buffer[loop] == magic_str[0]){ if((magic = strstr(&buffer[loop], magic_str))){ - printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); + //printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); printf("Found Magic %X%X%X%X\n", buffer[loop + strlen(magic_str)], buffer[loop + strlen(magic_str) + 2], -- cgit v1.2.3