diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-22 15:05:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-22 15:05:24 +0200 |
| commit | dcb585a900e04b71974fa82bf2170eb3f810b9b5 (patch) | |
| tree | e7517ee983d5c0e5915d4776489d3f5a95b1d67b | |
| parent | ed46779b8b7b171ad8882da68f4c5ec3026d80f2 (diff) | |
fix ext4 when choosen as module
| -rw-r--r-- | mk/modules.mk | 17 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 5 |
2 files changed, 9 insertions, 13 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index db3875427..68152b21c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -837,16 +837,6 @@ $(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\ $(MODULES_DIR)/kernel/drivers/crypto/geode-aes \ ,20)) -#$(eval $(call KMOD_template,CRYPTO_DEV_HIFN_795X,crypto-dev-hifn-795x,\ -# $(MODULES_DIR)/kernel/drivers/crypto/hifn_795x \ -#,20, crypto-manager2)) - -ifeq ($(KERNEL_BASE),3) -ifeq ($(KERNEL_MAJ),4) -$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\ - $(MODULES_DIR)/kernel/crypto/crypto_algapi \ -,02)) - $(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\ $(MODULES_DIR)/kernel/crypto/pcompress \ ,03)) @@ -874,8 +864,6 @@ $(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\ $(MODULES_DIR)/kernel/crypto/eseqiv \ $(MODULES_DIR)/kernel/crypto/chainiv \ ,07)) -endif -endif $(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\ $(MODULES_DIR)/kernel/crypto/authenc \ @@ -1086,8 +1074,11 @@ $(eval $(call KMOD_template,EXT3_FS,ext3-fs,\ $(MODULES_DIR)/kernel/fs/ext3/ext3 \ ,30)) -$(eval $(call KMOD_template,EXT4_FS,ext4-fs,\ +$(eval $(call KMOD_template,JBD2,jbd2,\ $(MODULES_DIR)/kernel/fs/jbd2/jbd2 \ +,29, kmod-crypto-hash2)) + +$(eval $(call KMOD_template,EXT4_FS,ext4-fs,\ $(MODULES_DIR)/kernel/fs/ext4/ext4 \ ,30)) diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 353942ba8..1eeef375f 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -11,6 +11,10 @@ config ADK_KERNEL_EXPORTFS boolean default y +config ADK_KERNEL_JBD2 + select ADK_KERNEL_CRYPTO_HASH2 + tristate + config ADK_KERNEL_YAFFS_YAFFS1 boolean @@ -94,6 +98,7 @@ config ADK_KERNEL_EXT4_FS tristate select ADK_KERNEL_FS_MBCACHE select ADK_KERNEL_CRC16 + select ADK_KERNEL_JBD2 default n help Ext4 filesystem. |