]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Added OCF.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Oct 2008 22:05:02 +0000 (00:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Oct 2008 22:05:02 +0000 (00:05 +0200)
config/kernel/kernel.config
lfs/linux

index 8df3799575faad35ca349a79aea2fe0825905714..4a12383b2e2d01c08e06919c4db1a2ba495db9a6 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Mon Oct 13 19:41:18 2008
+# Mon Oct 20 22:03:50 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2429,6 +2429,24 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+
+#
+# OCF Configuration
+#
+CONFIG_OCF_OCF=m
+CONFIG_OCF_RANDOMHARVEST=y
+CONFIG_OCF_FIPS=y
+CONFIG_OCF_CRYPTODEV=m
+CONFIG_OCF_CRYPTOSOFT=m
+CONFIG_OCF_SAFE=m
+CONFIG_OCF_IXP4XX=m
+CONFIG_OCF_IXP4XX_SHA1_MD5=y
+CONFIG_OCF_HIFN=m
+CONFIG_OCF_HIFNHIPP=m
+CONFIG_OCF_TALITOS=m
+CONFIG_OCF_EP80579=m
+CONFIG_OCF_OCFNULL=m
+CONFIG_OCF_BENCH=m
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
 
index 3db773377e23ce77b940663cec0ed072c487ffb0..52fd9484622320a3f5f2a2b6ca61d901d2c54964 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -41,6 +41,7 @@ FULLVER    = $(VER)$(LOCALVERSION)
 # Patches
 FRANDOM_PATCH  = linux-2.6.25-frandom-1.patch
 GRSEC_PATCH    = grsecurity-2.1.12-$(VER)-200808171148.patch
+OCF_PATCH      = ocf-linux-26-20080917.patch
 REISER4_PATCH  = reiser4-for-$(VER).patch
 SQUASHFS_PATCH = $(THISAPP)-squashfs3.4-1.patch
 
@@ -49,6 +50,7 @@ SQUASHFS_PATCH = $(THISAPP)-squashfs3.4-1.patch
 ###############################################################################
 
 objects = $(DL_FILE) \
+       $(OCF_PATCH) \
        $(REISER4_PATCH) \
        $(SQUASHFS_PATCH)
 
@@ -83,6 +85,11 @@ ifeq "$(SSP)" "1"
        #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(FRANDOM_PATCH)
 endif
 
+       ### OCF
+       #
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(OCF_PATCH)
+       cd $(DIR_APP) && echo "source \"crypto/ocf/Kconfig\"" >> crypto/Kconfig
+
        ### Reiser4
        #
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(REISER4_PATCH)