Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On 03/30/2011 02:58 PM, Peter Wagner wrote: update linux to 2.6.37.6 Hi Peter, Thank you for the patch. It is applied in r26441 with a small change in target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch Hauke ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
make oldconfig did not help, I still get these errors when linking the kernel: LD vmlinux drivers/built-in.o: In function `mv_remove': staging.c:(.text+0x49250): undefined reference to `crypto_unregister_ahash' staging.c:(.text+0x49264): undefined reference to `crypto_unregister_ahash' drivers/built-in.o: In function `mv_probe': staging.c:(.text+0x494f0): undefined reference to `crypto_register_ahash' staging.c:(.text+0x49518): undefined reference to `crypto_register_ahash' and some more missing references. All due to the missing ahash.o and shash.o while linking. When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should there be a patch to force this option to be always selected? Only for orion target? Or lies the problem somewhere else? I am unsure what to do with this... :) Greetings, Maarten On Thu, 2011-03-31 at 16:54 +0200, Peter Wagner wrote: you should at least try make oldconfig befor you compile the kernel ... Am Donnerstag, 31. März 2011, 00:02:08 schrieb Peter Wagner: did you fetch the newest trunk? and make target/linux/clean ; make oldconfig and then make? Am Mittwoch, 30. März 2011, 23:59:33 schrieb Maarten Bezemer: On Wed, 2011-03-30 at 23:39 +0200, Maarten Bezemer wrote: by replacing 'crypto_hash-objs' to 'objs'. 'objs' should be 'objs-y' (of course) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On 2011-04-02 2:31 PM, Maarten Bezemer wrote: make oldconfig did not help, I still get these errors when linking the kernel: LD vmlinux drivers/built-in.o: In function `mv_remove': staging.c:(.text+0x49250): undefined reference to `crypto_unregister_ahash' staging.c:(.text+0x49264): undefined reference to `crypto_unregister_ahash' drivers/built-in.o: In function `mv_probe': staging.c:(.text+0x494f0): undefined reference to `crypto_register_ahash' staging.c:(.text+0x49518): undefined reference to `crypto_register_ahash' and some more missing references. All due to the missing ahash.o and shash.o while linking. When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should there be a patch to force this option to be always selected? Only for orion target? Or lies the problem somewhere else? I am unsure what to do with this... :) Should be fixed in r26402 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. Hauke On 04/02/2011 05:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 4df62de..e504ae7 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -428,6 +428,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine + DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko AUTOLOAD:=$(call AutoLoad,09,mv_cesa) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On 2011-04-02 5:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Ah, I thought this was related to the previous OCF issue. Seems that the mv_cesa driver needs a Kconfig fix as well. Committed in r26406 - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On 2011-04-02 5:20 PM, Hauke Mehrtens wrote: Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. This patch won't fix his issue, as mv_cesa is compiled into the kernel on orion. But it's a nice addition to what I just committed, useful for other platforms that might use this module ;) By the way, please change the kmod-crypto-hash selection into kmod-crypto-manager, that way it'll include the required blkcipher dependency as well. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
Hello, It took me a while to figure out why your patch was not working, but it adds a second DEPENDS, which is overridden with the original one. So your patch needs to be updated a bit. Another thing is, I did not have the hardware crypto enabled (as I did/do now know that my WRT350Nv2 has hardware crypo support). So your patch does not help fixing the problem when CONFIG_kmod-crypto-mv-cesa is deselected. (in OpenWRT config) In this situation the config-default for orion (in target/linux/orion) selects CONFIG_CRYPTO_DEV_MV_CESA and not CONFIG_CRYPTO_HASH So I guess you need to update config-default in your patch as well? Greetings, Maarten On Sat, 2011-04-02 at 17:20 +0200, Hauke Mehrtens wrote: Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. Hauke On 04/02/2011 05:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
I see the wrong patch got applied before my email arrived, so I created a new patch to fix the it On Sat, 2011-04-02 at 18:00 +0200, Maarten Bezemer wrote: Hello, It took me a while to figure out why your patch was not working, but it adds a second DEPENDS, which is overridden with the original one. So your patch needs to be updated a bit. Another thing is, I did not have the hardware crypto enabled (as I did/do now know that my WRT350Nv2 has hardware crypo support). So your patch does not help fixing the problem when CONFIG_kmod-crypto-mv-cesa is deselected. (in OpenWRT config) In this situation the config-default for orion (in target/linux/orion) selects CONFIG_CRYPTO_DEV_MV_CESA and not CONFIG_CRYPTO_HASH So I guess you need to update config-default in your patch as well? Greetings, Maarten On Sat, 2011-04-02 at 17:20 +0200, Hauke Mehrtens wrote: Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. Hauke On 04/02/2011 05:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Index: package/kernel/modules/crypto.mk === --- package/kernel/modules/crypto.mk (revision 26409) +++ package/kernel/modules/crypto.mk (working copy) @@ -428,12 +428,11 @@ define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko AUTOLOAD:=$(call AutoLoad,09,mv_cesa) SUBMENU:=Cryptographic API modules - DEPENDS:=kmod-crypto-core @TARGET_kirkwood||TARGET_orion + DEPENDS:=+kmod-crypto-manager kmod-crypto-core @TARGET_kirkwood||TARGET_orion endef $(eval $(call KernelPackage,crypto-mv-cesa)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
Hi Maarten, Yes I should read it more carefully or test it. ;-) Why the hell is then DEPENDS file at the end of the block? Felix fixed this already when the module is build into the kernel in r26406, when building it as a module it is now fixed in r26413. Hauke On 04/02/2011 06:12 PM, Maarten Bezemer wrote: I see the wrong patch got applied before my email arrived, so I created a new patch to fix the it On Sat, 2011-04-02 at 18:00 +0200, Maarten Bezemer wrote: Hello, It took me a while to figure out why your patch was not working, but it adds a second DEPENDS, which is overridden with the original one. So your patch needs to be updated a bit. Another thing is, I did not have the hardware crypto enabled (as I did/do now know that my WRT350Nv2 has hardware crypo support). So your patch does not help fixing the problem when CONFIG_kmod-crypto-mv-cesa is deselected. (in OpenWRT config) In this situation the config-default for orion (in target/linux/orion) selects CONFIG_CRYPTO_DEV_MV_CESA and not CONFIG_CRYPTO_HASH So I guess you need to update config-default in your patch as well? Greetings, Maarten On Sat, 2011-04-02 at 17:20 +0200, Hauke Mehrtens wrote: Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. Hauke On 04/02/2011 05:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
Thanks for the fixes (and Felix also of course!) Now everything build again happily for my target :) Maarten On Sat, 2011-04-02 at 21:35 +0200, Hauke Mehrtens wrote: Hi Maarten, Yes I should read it more carefully or test it. ;-) Why the hell is then DEPENDS file at the end of the block? Felix fixed this already when the module is build into the kernel in r26406, when building it as a module it is now fixed in r26413. Hauke On 04/02/2011 06:12 PM, Maarten Bezemer wrote: I see the wrong patch got applied before my email arrived, so I created a new patch to fix the it On Sat, 2011-04-02 at 18:00 +0200, Maarten Bezemer wrote: Hello, It took me a while to figure out why your patch was not working, but it adds a second DEPENDS, which is overridden with the original one. So your patch needs to be updated a bit. Another thing is, I did not have the hardware crypto enabled (as I did/do now know that my WRT350Nv2 has hardware crypo support). So your patch does not help fixing the problem when CONFIG_kmod-crypto-mv-cesa is deselected. (in OpenWRT config) In this situation the config-default for orion (in target/linux/orion) selects CONFIG_CRYPTO_DEV_MV_CESA and not CONFIG_CRYPTO_HASH So I guess you need to update config-default in your patch as well? Greetings, Maarten On Sat, 2011-04-02 at 17:20 +0200, Hauke Mehrtens wrote: Hi, The attached patch should fix the problem. mv_remove and mv_probe are from drivers/crypto/mv_cesa.c and this driver depends on crypto_hash.ko. Please test this and report the results , if it fixes the problem I will commit this. This has nothing to do with an update to kernel 2.6.37.6, what is blocking 2.6.37.6, if nothing then I would like to add this patch. Hauke On 04/02/2011 05:04 PM, Maarten Bezemer wrote: On Sat, 2011-04-02 at 14:51 +0200, Felix Fietkau wrote: On 2011-04-02 2:31 PM, Maarten Bezemer wrote: When I select CONFIG_CRYPTO_HASH in the kernel config, everything works! Should be fixed in r26402 Thanks for putting effort into this problem. But unfortunately, this change does not select CONFIG_CRYPTO_HASH. Orion does not have CONFIG_OCF_OCF and thus CONFIG_OCF_CYRPTOSOFT selected.. If I select it manually (by changing the config-default of the orion target) Everything works, so I suppose another update is required for the orion target default config? Or is it unwanted to have this enabled by default? Thanks again, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
you should at least try make oldconfig befor you compile the kernel ... Am Donnerstag, 31. März 2011, 00:02:08 schrieb Peter Wagner: did you fetch the newest trunk? and make target/linux/clean ; make oldconfig and then make? Am Mittwoch, 30. März 2011, 23:59:33 schrieb Maarten Bezemer: On Wed, 2011-03-30 at 23:39 +0200, Maarten Bezemer wrote: by replacing 'crypto_hash-objs' to 'objs'. 'objs' should be 'objs-y' (of course) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
dont apply this patch i still get a compile error after i did a make target/linux/clean failure is: ERROR: crypto_alloc_ahash [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_alloc_ablkcipher [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_ahash_digest [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_ahash_setkey [crypto/ocf/cryptosoft.ko] undefined! Am Mittwoch, 30. März 2011, 14:58:08 schrieb Peter Wagner: update linux to 2.6.37.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
I am having the same error with 2.6.37.4 (for orion target). The Makefile in the crypto dir seems to be broken... It contains something like (from top of my head so don't shoot me if I am wrong): hash_objs += ahash.o hash_objs += shash.o But the hash_objs variable is never used... A simple fix is to changes 'hash_objs' to 'objs', but then those 2 files are always included. This did not seem a good solution to me, so I did not send a patch yet... As I did not have time to look further into this problem and I supposed the kernel developers need to fix this, I was waiting for a solution. Greetings, Maarten On Wed, 2011-03-30 at 15:27 +0200, Peter Wagner wrote: dont apply this patch i still get a compile error after i did a make target/linux/clean failure is: ERROR: crypto_alloc_ahash [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_alloc_ablkcipher [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_ahash_digest [crypto/ocf/cryptosoft.ko] undefined! ERROR: crypto_ahash_setkey [crypto/ocf/cryptosoft.ko] undefined! Am Mittwoch, 30. März 2011, 14:58:08 schrieb Peter Wagner: update linux to 2.6.37.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On 2011-03-30 4:06 PM, Maarten Bezemer wrote: I am having the same error with 2.6.37.4 (for orion target). The Makefile in the crypto dir seems to be broken... It contains something like (from top of my head so don't shoot me if I am wrong): hash_objs += ahash.o hash_objs += shash.o But the hash_objs variable is never used... A simple fix is to changes 'hash_objs' to 'objs', but then those 2 files are always included. This did not seem a good solution to me, so I did not send a patch yet... As I did not have time to look further into this problem and I supposed the kernel developers need to fix this, I was waiting for a solution. Should be fixed in r26372 - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
commit 26375 fixes the compile error the attached patch works Am Mittwoch, 30. März 2011, 17:07:33 schrieb Felix Fietkau: On 2011-03-30 4:06 PM, Maarten Bezemer wrote: I am having the same error with 2.6.37.4 (for orion target). The Makefile in the crypto dir seems to be broken... It contains something like (from top of my head so don't shoot me if I am wrong): hash_objs += ahash.o hash_objs += shash.o But the hash_objs variable is never used... A simple fix is to changes 'hash_objs' to 'objs', but then those 2 files are always included. This did not seem a good solution to me, so I did not send a patch yet... As I did not have time to look further into this problem and I supposed the kernel developers need to fix this, I was waiting for a solution. Should be fixed in r26372 - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel diff --git a/include/kernel-version.mk b/include/kernel-version.mk index ae82a5d..4f204ac 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -20,8 +20,8 @@ endif ifeq ($(LINUX_VERSION),2.6.36.4) LINUX_KERNEL_MD5SUM:=c05dd941d0e249695e9f7256e1bf endif -ifeq ($(LINUX_VERSION),2.6.37.4) - LINUX_KERNEL_MD5SUM:=1d2dc321017a8dde09b779b4d8233273 +ifeq ($(LINUX_VERSION),2.6.37.6) + LINUX_KERNEL_MD5SUM:=05970afdce8ec4323a10dcd42bc4fb0c endif ifeq ($(LINUX_VERSION),2.6.38.2) LINUX_KERNEL_MD5SUM:=5e9d0edae15053ea9acd932e6d162d03 diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 4ae2a5a..7ec039d 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -11,7 +11,7 @@ BOARD:=ar7 BOARDNAME:=TI AR7 FEATURES:=squashfs jffs2 atm -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 5b17f90..f2fbf6b 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves SUBTARGETS:=generic nand -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 91dadea..dea8032 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index c02454a..67421d1 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00 FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 8d367d5..199c346 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz ka...@openwrt.org -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index ee602ee..dac4c62 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz ka...@openwrt.org -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch index a951437..b81ab74 100644 --- a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch @@ -1,6 +1,8 @@ a/drivers/pci/Kconfig -+++ b/drivers/pci/Kconfig -@@ -61,6 +61,12 @@ config XEN_PCIDEV_FE_DEBUG +Index: linux-2.6.38.1/drivers/pci/Kconfig +=== +--- linux-2.6.38.1.orig/drivers/pci/Kconfig 2011-03-23 21:04:47.0 +0100 linux-2.6.38.1/drivers/pci/Kconfig 2011-03-28 16:48:00.052118712 +0200 +@@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG When in doubt, say N. @@ -13,8 +15,10 @@ config HT_IRQ bool Interrupts on hypertransport devices default y a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c +Index: linux-2.6.38.1/drivers/pci/quirks.c +=== +--- linux-2.6.38.1.orig/drivers/pci/quirks.c 2011-03-23 21:04:47.0 +0100
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On Wed, 2011-03-30 at 17:07 +0200, Felix Fietkau wrote: On 2011-03-30 4:06 PM, Maarten Bezemer wrote: I am having the same error with 2.6.37.4 (for orion target). The Makefile in the crypto dir seems to be broken... It contains something like (from top of my head so don't shoot me if I am wrong): hash_objs += ahash.o hash_objs += shash.o But the hash_objs variable is never used... A simple fix is to changes 'hash_objs' to 'objs', but then those 2 files are always included. This did not seem a good solution to me, so I did not send a patch yet... As I did not have time to look further into this problem and I supposed the kernel developers need to fix this, I was waiting for a solution. Should be fixed in r26372 - Felix I was wrong, I have another problem: LD vmlinux drivers/built-in.o: In function `mv_remove': staging.c:(.text+0x49250): undefined reference to `crypto_unregister_ahash' staging.c:(.text+0x49264): undefined reference to `crypto_unregister_ahash' drivers/built-in.o: In function `mv_probe': staging.c:(.text+0x494f0): undefined reference to `crypto_register_ahash' staging.c:(.text+0x49518): undefined reference to `crypto_register_ahash' drivers/built-in.o: In function `mv_hash_final_fallback': staging.c:(.text+0x49b58): undefined reference to `crypto_shash_update' staging.c:(.text+0x49be8): undefined reference to `crypto_shash_final' drivers/built-in.o: In function `queue_manag': staging.c:(.text+0x4a0e8): undefined reference to `crypto_ahash_type' drivers/built-in.o: In function `mv_cra_hash_init': staging.c:(.text+0x4a21c): undefined reference to `crypto_alloc_shash' staging.c:(.text+0x4a258): undefined reference to `crypto_alloc_shash' drivers/built-in.o: In function `mv_hash_setkey': staging.c:(.text+0x4a358): undefined reference to `crypto_shash_setkey' staging.c:(.text+0x4a3e0): undefined reference to `crypto_shash_digest' staging.c:(.text+0x4a478): undefined reference to `crypto_shash_update' staging.c:(.text+0x4a4cc): undefined reference to `crypto_shash_update' Which is fixed by updating this part of the crypto/Makefile crypto_hash-objs += ahash.o crypto_hash-objs += shash.o by replacing 'crypto_hash-objs' to 'objs'. Which has the (undesired?) side-effect that ahash.c and shash.c are always included in the kernel... In the same Makefile, I also notice the crypto-objs, crypto_algapi and cryptomgr-objs variables. I suppose these have the same problem? This problem occurs is in kernel versions 2.6.37.4 and 2.6.37.6 (I did not look at other versions). Greetings, Maarten ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] update linux to 2.6.37.6 - patch attached
On Wed, 2011-03-30 at 23:39 +0200, Maarten Bezemer wrote: by replacing 'crypto_hash-objs' to 'objs'. 'objs' should be 'objs-y' (of course) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
