summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
commit220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch)
tree406f65eea71fabd8cf66c2bd1108ec63f8c349ee /target/linux
parent38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff)
rework architecture / embedded systems concept
Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Config.in3
-rw-r--r--target/linux/config/Config.in.aufs1
-rw-r--r--target/linux/config/Config.in.block81
-rw-r--r--target/linux/config/Config.in.bluetooth3
-rw-r--r--target/linux/config/Config.in.cpu3
-rw-r--r--target/linux/config/Config.in.crypto232
-rw-r--r--target/linux/config/Config.in.debug27
-rw-r--r--target/linux/config/Config.in.flash80
-rw-r--r--target/linux/config/Config.in.fs22
-rw-r--r--target/linux/config/Config.in.fsnet8
-rw-r--r--target/linux/config/Config.in.graphics23
-rw-r--r--target/linux/config/Config.in.input21
-rw-r--r--target/linux/config/Config.in.isdn23
-rw-r--r--target/linux/config/Config.in.kernel75
-rw-r--r--target/linux/config/Config.in.leds16
-rw-r--r--target/linux/config/Config.in.misc74
-rw-r--r--target/linux/config/Config.in.multimedia27
-rw-r--r--target/linux/config/Config.in.netdevice91
-rw-r--r--target/linux/config/Config.in.network4
-rw-r--r--target/linux/config/Config.in.nls3
-rw-r--r--target/linux/config/Config.in.pm4
-rw-r--r--target/linux/config/Config.in.systems26
-rw-r--r--target/linux/config/Config.in.usb43
-rw-r--r--target/linux/config/Config.in.watchdog70
-rw-r--r--target/linux/patches/2.6.35.7/aufs2.patch24455
-rw-r--r--target/linux/patches/2.6.35.7/bsd-compatibility.patch2513
-rw-r--r--target/linux/patches/2.6.35.7/cc-abstract.patch14
-rw-r--r--target/linux/patches/2.6.35.7/cris-initrd.patch14
-rw-r--r--target/linux/patches/2.6.35.7/cris-sound.patch12
-rw-r--r--target/linux/patches/2.6.35.7/cygwin-compat.patch14
-rw-r--r--target/linux/patches/2.6.35.7/exmap.patch11
-rw-r--r--target/linux/patches/2.6.35.7/freebsd-compat.patch11
-rw-r--r--target/linux/patches/2.6.35.7/mtd-root.patch62
-rw-r--r--target/linux/patches/2.6.35.7/ocf-20100325.patch87546
-rw-r--r--target/linux/patches/2.6.35.7/startup.patch20
-rw-r--r--target/linux/patches/2.6.35.7/yaffs2.patch15068
-rw-r--r--target/linux/patches/2.6.36/ar7.patch90
-rw-r--r--target/linux/patches/2.6.36/ar71xx.patch18666
-rw-r--r--target/linux/patches/2.6.36/brcm.patch106
-rw-r--r--target/linux/patches/2.6.36/cris-initrd.patch14
-rw-r--r--target/linux/patches/2.6.36/cris-sound.patch12
-rw-r--r--target/linux/patches/2.6.36/cris.patch5736
-rw-r--r--target/linux/patches/2.6.36/foxg20.patch522
-rw-r--r--target/linux/patches/2.6.36/io_map_base.patch52
-rw-r--r--target/linux/patches/2.6.36/lemote.patch4267
-rw-r--r--target/linux/patches/2.6.36/rb532.patch18
46 files changed, 30055 insertions, 130128 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in
index a68bbadb6..6d482b1ab 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,5 +1,7 @@
+source target/linux/config/Config.in.systems
source target/linux/config/Config.in.cpu
source target/linux/config/Config.in.block
+source target/linux/config/Config.in.flash
source target/linux/config/Config.in.fs
source target/linux/config/Config.in.netdevice
source target/linux/config/Config.in.usb
@@ -12,6 +14,7 @@ source target/linux/config/Config.in.multimedia
source target/linux/config/Config.in.crypto
source target/linux/config/Config.in.bluetooth
#source target/linux/config/Config.in.isdn
+source target/linux/config/Config.in.watchdog
source target/linux/config/Config.in.leds
source target/linux/config/Config.in.misc
source target/linux/config/Config.in.lib
diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs
index 7956f31c1..524133061 100644
--- a/target/linux/config/Config.in.aufs
+++ b/target/linux/config/Config.in.aufs
@@ -1,6 +1,5 @@
config ADK_KPACKAGE_KMOD_AUFS_FS
prompt "Aufs (Advanced multi layered unification filesystem) support"
- depends on !ADK_LINUX_CRIS_FOXBOARD
tristate
help
Aufs is a stackable unification filesystem such as Unionfs,
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index c4c583a90..f70c8f162 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -1,4 +1,5 @@
-menu "Block devices support"
+config ADK_KERNEL_BLOCK
+ boolean
config ADK_KERNEL_MD
boolean
@@ -42,7 +43,6 @@ config ADK_KERNEL_BLK_DEV
config ADK_KERNEL_BLK_DEV_DM
boolean
select ADK_KERNEL_MD
- depends on !ADK_LINUX_CRIS_FOXBOARD
config ADK_KERNEL_ATA
boolean
@@ -50,30 +50,91 @@ config ADK_KERNEL_ATA
config ADK_KERNEL_ATA_SFF
boolean
+config ADK_KERNEL_ATA_BMDMA
+ boolean
+
config ADK_KERNEL_CONNECTOR
boolean
+config ADK_KERNEL_MMC
+ boolean
+
+config ADK_KERNEL_MMC_BLOCK
+ boolean
+
+config ADK_KERNEL_MMC_AT91
+ boolean
+ select ADK_KERNEL_BLOCK
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_MMC
+ select ADK_KERNEL_MMC_BLOCK
+ select ADK_KERNEL_BLK_DEV
+ select ADK_KERNEL_BLK_DEV_SD
+ default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+ default n
+
+config ADK_KERNEL_PATA_RB532
+ boolean
+ select ADK_KERNEL_BLOCK
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_ATA_SFF
+ select ADK_KERNEL_ATA_BMDMA
+ select ADK_KERNEL_BLK_DEV
+ select ADK_KERNEL_BLK_DEV_SD
+ default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+ default n
+
+config ADK_KERNEL_PATA_AMD
+ boolean
+ select ADK_KERNEL_BLOCK
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_ATA_SFF
+ select ADK_KERNEL_ATA_BMDMA
+ select ADK_KERNEL_BLK_DEV
+ select ADK_KERNEL_BLK_DEV_SD
+ default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
+ default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+ default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+ default n
+
+config ADK_KERNEL_PATA_SC1200
+ boolean
+ select ADK_KERNEL_BLOCK
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_ATA_SFF
+ select ADK_KERNEL_ATA_BMDMA
+ select ADK_KERNEL_BLK_DEV
+ select ADK_KERNEL_BLK_DEV_SD
+ default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
+ default n
+
config ADK_KERNEL_ATA_PIIX
boolean
select ADK_KERNEL_BLOCK
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
select ADK_KERNEL_ATA_SFF
+ select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
- default y if ADK_HARDWARE_IBM_X40
- default y if ADK_HARDWARE_QEMU_X86
- default y if ADK_HARDWARE_QEMU_X86_64
+ default y if ADK_TARGET_SYSTEM_IBM_X40
+ default y if ADK_TARGET_SYSTEM_QEMU_X86
+ default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default n
config ADK_KERNEL_SATA_AHCI
tristate
select ADK_KERNEL_BLOCK
select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
depends on ADK_TARGET_WITH_SATA
- default y if ADK_HARDWARE_SHUTTLE
default n
+menu "Block devices support"
+
config ADK_KPACKAGE_KMOD_SATA_AHCI
prompt "kmod-sata-ahci.................... AHCI SATA driver"
tristate
@@ -197,14 +258,12 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR
config ADK_KERNEL_BLK_DEV_MD
tristate
select ADK_KERNEL_MD
- depends on !ADK_LINUX_CRIS_FOXBOARD
default n
config ADK_KPACKAGE_KMOD_BLK_DEV_MD
prompt "kmod-md........................... RAID support"
tristate
depends on !ADK_KERNEL_BLK_DEV_MD
- depends on !ADK_LINUX_CRIS_FOXBOARD
select ADK_KERNEL_MD
help
@@ -239,7 +298,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456
config ADK_KPACKAGE_KMOD_BLK_DEV_DM
prompt "kmod-dm........................... Device Mapper support"
select ADK_KERNEL_MD
- depends on !(ADK_KERNEL_BLK_DEV_DM || ADK_LINUX_CRIS_FOXBOARD)
+ depends on !ADK_KERNEL_BLK_DEV_DM
tristate
help
Device-mapper is a low level volume manager. It works by allowing
@@ -251,7 +310,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
config ADK_KPACKAGE_KMOD_DM_CRYPT
prompt "kmod-dm-crypt..................... Crypt target support"
- depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD)
+ depends on !ADK_KERNEL_DM_CRYPT
select ADK_KPACKAGE_KMOD_BLK_DEV_DM
select ADK_KERNEL_MD
select ADK_KERNEL_CRYPTO
@@ -270,7 +329,6 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT
config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
prompt "kmod-dm-snapshot.................. Snapshot target"
select ADK_KPACKAGE_KMOD_BLK_DEV_DM
- depends on !ADK_LINUX_CRIS_FOXBOARD
tristate
help
Allow volume managers to take writable snapshots of a device.
@@ -278,7 +336,6 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
config ADK_KPACKAGE_KMOD_DM_MIRROR
prompt "kmod-dm-mirror.................... Mirror target"
select ADK_KPACKAGE_KMOD_BLK_DEV_DM
- depends on !ADK_LINUX_CRIS_FOXBOARD
tristate
help
Allow volume managers to mirror logical volumes, also
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 748a6b280..0d4d6f7af 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -1,5 +1,5 @@
menu "Bluetooth"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI
config ADK_KPACKAGE_KMOD_BT
prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
@@ -68,7 +68,6 @@ config ADK_KPACKAGE_KMOD_BT_HIDP
prompt "kmod-bluetooth-hidp............... HIDP protocol support"
tristate
default n
- depends on !ADK_LINUX_CRIS_FOXBOARD
select ADK_KERNEL_INPUT
select ADK_KERNEL_HID
depends on ADK_KPACKAGE_KMOD_BT
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index f34cb5238..a145ea217 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -3,3 +3,6 @@ config ADK_KERNEL_MATOM
config ADK_KERNEL_MPENTIUMM
boolean
+
+config ADK_KERNEL_MGEODE_LX
+ boolean
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index b23d22122..1a62db2f8 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -1,70 +1,58 @@
menu "Crypto kernel modules"
config ADK_KERNEL_CRYPTO
- boolean
- default n
+ tristate
config ADK_KERNEL_CRYPTO_HW
- boolean
- default n
+ tristate
config ADK_KERNEL_OCF_FIPS
boolean
- default n
config ADK_KERNEL_OCF_CRYPTODEV
boolean
- default n
-
-config ADK_KERNEL_CRYPTO_MANAGER
- tristate
- default n
config ADK_KERNEL_OCF_OCF
boolean
- default n
select ADK_KERNEL_CRYPTO
select ADK_KERNEL_OCF_FIPS
select ADK_KERNEL_OCF_CRYPTODEV
+ default n
config ADK_KERNEL_CRYPTO_AES
boolean
- default n
config ADK_KERNEL_CRYPTO_SHA256
boolean
- default n
config ADK_KERNEL_CRYPTO_CBC
boolean
- default n
comment "Hardware cryptography"
menu "Hardware crypto devices"
config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
- prompt "Support for the Geode LX/GX AES engine"
+ prompt "kmod-crypto-dev-geode.................. Support for the Geode LX/GX AES engine"
tristate
- select ADK_KERNEL_CRYPTO_HW
select ADK_KERNEL_CRYPTO
+ select ADK_KERNEL_CRYPTO_HW
select ADK_KPACKAGE_KMOD_CRYPTO_ECB
select ADK_KPACKAGE_KMOD_CRYPTO_CBC
- depends on ADK_LINUX_ALIX
- default y if (ADK_LINUX_ALIX && ADK_PACKAGE_OPENSWAN)
- default y if (ADK_LINUX_ALIX && ADK_PACKAGE_STRONGSWAN)
+ depends on ADK_TARGET_WITH_GEODE_CRYPTO
+ default y if ADK_TARGET_WITH_GEODE_CRYPTO
default n
help
Say 'Y' here to use the AMD Geode LX processor on-board AES
engine for the CryptoAPI AES algorithm.
config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
- prompt "Driver HIFN 795x crypto accelerator chips"
+ prompt "kmod-crypto-dev-hifn-795x.............. Driver for HIFN 795x crypto accelerator chips"
tristate
- select ADK_KERNEL_CRYPTO_HW
select ADK_KERNEL_CRYPTO
- select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+ select ADK_KERNEL_CRYPTO_HW
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
select ADK_KPACKAGE_KMOD_CRYPTO_DES
+ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
default n
help
This option allows you to have support for HIFN 795x crypto adapters.
@@ -72,28 +60,30 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
endmenu
menu "OpenBSD Cryptographic framework"
-depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241 || ADK_LINUX_QEMU || ADK_LINUX_ARM_FOXG20)
-
config ADK_KPACKAGE_KMOD_OCF_HIFN
- prompt "kmod-cryptodev-hifn................ hifn engine"
+ prompt "kmod-ocf-hifn..................... hifn engine"
tristate
default n
select ADK_KERNEL_OCF_OCF
+ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
+ select ADK_KPACKAGE_KMOD_CRYPTO_AES
help
Engine for cryptodev that uses Hifn based accelerators
such as the 7951, 7955, 7956, 7751, 7811.
config ADK_KPACKAGE_KMOD_OCF_SAFE
- prompt "kmod-cryptodev-safe................ safenet engine"
+ prompt "kmod-ocf-safe..................... safenet engine"
tristate
default n
select ADK_KERNEL_OCF_OCF
+ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
+ select ADK_KPACKAGE_KMOD_CRYPTO_AES
help
Engine for cryptodev that uses a number of the safenet Excel
crypto accelerators. Currently for the 1141 and 1741.
config ADK_KPACKAGE_KMOD_OCF_IXP4XX
- prompt "kmod-cryptodev-ixp4xx.............. IXP4xx engine"
+ prompt "kmod-ocf-ixp4xx................... IXP4xx engine"
tristate
default n
select ADK_KERNEL_OCF_OCF
@@ -103,11 +93,11 @@ config ADK_KPACKAGE_KMOD_OCF_IXP4XX
Requires the Intel Access library.
config ADK_KPACKAGE_KMOD_OCF_TALITOS
- prompt "kmod-cryptodev-talitos............. talitos engine"
+ prompt "kmod-ocf-talitos.................. talitos engine"
tristate
default n
select ADK_KERNEL_OCF_OCF
- depends on ADK_powerpc || ADK_m68k || ADK_ppc
+ depends on ADK_ppc
help
Engine for cryptodev that uses Freescale's security engine (SEC/talitos).
@@ -116,58 +106,90 @@ endmenu
comment "Software cryptography"
menu "Crypto core / Block and Hash modes"
-config ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- prompt "kmod-crypto-algapi.................. Crypto algorithm API"
+
+config ADK_KERNEL_MOD_CRYPTO_PCOMP
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2
tristate
- default n
select ADK_KERNEL_CRYPTO
+ select ADK_KERNEL_MOD_CRYPTO_PCOMP
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ default n
help
-config ADK_KPACKAGE_KMOD_CRYPTO_AEAD
- prompt "kmod-crypto-aead.................... Crypto algorithm AEAD"
+config ADK_KERNEL_MOD_CRYPTO_ALGAPI
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
tristate
+ select ADK_KERNEL_CRYPTO
+ select ADK_KERNEL_MOD_CRYPTO_ALGAPI
default n
+ help
+
+config ADK_KERNEL_MOD_CRYPTO_AEAD
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_AEAD2
+ tristate
select ADK_KERNEL_CRYPTO
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KERNEL_MOD_CRYPTO_AEAD
+ default n
help
-config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
- prompt "kmod-crypto-manager.................. Crypto algorithm manager"
+config ADK_KERNEL_MOD_CRYPTO_HASH
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_HASH2
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KERNEL_MOD_CRYPTO_HASH
default n
- depends on !ADK_KERNEL_CRYPTO_MANAGER
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
help
-config ADK_KPACKAGE_KMOD_CRYPTO_HASH
- prompt "kmod-crypto-hash..................... Crypto hash support"
+config ADK_KERNEL_MOD_CRYPTO_BLKCIPHER
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KERNEL_MOD_CRYPTO_BLKCIPHER
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
-config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
- prompt "kmod-crypto-blkcipher................ Crypto block cipher support"
+config ADK_KERNEL_MOD_CRYPTO_WORKQUEUE
tristate
+
+config ADK_KERNEL_MOD_CRYPTO_MANAGER
+ tristate
+
+config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+ prompt "kmod-crypto-manager2................. Crypto algorithm manager"
+ tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+ select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
+ select ADK_KPACKAGE_KMOD_CRYPTO_AEAD2
+ select ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2
+ select ADK_KERNEL_MOD_CRYPTO_MANAGER
+ select ADK_KERNEL_MOD_CRYPTO_WORKQUEUE
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC
prompt "kmod-crypto-authenc.................. AuthENC (IPsec)"
tristate
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
default n
help
config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator"
- select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
help
This IV generator generates an IV based on a sequence number by
xoring it with a salt. This algorithm is mainly useful for CTR
@@ -176,8 +198,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
prompt "kmod-crypto-cbc...................... CBC support"
tristate
depends on !ADK_KERNEL_CRYPTO_CBC
- select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
default n
help
CBC: Cipher Block Chaining mode
@@ -186,7 +208,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
config ADK_KPACKAGE_KMOD_CRYPTO_CCM
prompt "kmod-crypto-ccm...................... CCM support"
tristate
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
select ADK_KPACKAGE_KMOD_CRYPTO_CTR
default n
help
@@ -195,7 +217,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CCM
config ADK_KPACKAGE_KMOD_CRYPTO_CTR
prompt "kmod-crypto-ctr...................... CTR support"
tristate
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
default n
help
@@ -205,9 +227,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTR
config ADK_KPACKAGE_KMOD_CRYPTO_ECB
prompt "kmod-crypto-ecb...................... ECB support"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
help
ECB: Electronic CodeBook mode
This is the simplest block cipher algorithm. It simply encrypts
@@ -216,9 +238,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ECB
config ADK_KPACKAGE_KMOD_CRYPTO_HMAC
prompt "kmod-crypto-hmac..................... HMAC support"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
help
HMAC: Keyed-Hashing for Message Authentication (RFC2104).
This is required for IPSec.
@@ -227,14 +249,18 @@ config ADK_KPACKAGE_KMOD_CRYPTO_XCBC
prompt "kmod-crypto-xcbc..................... XCBC support"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
- select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
help
XCBC: Keyed-Hashing with encryption algorithm
+config ADK_KERNEL_MOD_CRYPTO_RNG
+ tristate
+
config ADK_KPACKAGE_KMOD_CRYPTO_RNG2
- prompt "kmod-crypto-rng...................... RNG support"
+ prompt "kmod-crypto-rng2..................... RNG support"
tristate
+ select ADK_KERNEL_MOD_CRYPTO_RNG
default n
help
Random number generator
@@ -246,8 +272,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MD4
prompt "kmod-crypto-md4...................... MD4 digest algorithm"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
MD4 message digest algorithm (RFC1320).
@@ -255,8 +281,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MD5
prompt "kmod-crypto-md5...................... MD5 digest algorithm"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
MD5 message digest algorithm (RFC1321).
@@ -264,8 +290,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA1
prompt "kmod-crypto-sha1..................... SHA1 digest algorithm"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
@@ -274,8 +300,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA256
tristate
default n
depends on !ADK_KERNEL_CRYPTO_SHA256
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
SHA256 secure hash standard (DFIPS 180-2).
@@ -286,8 +312,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA512
prompt "kmod-crypto-sha512................... SHA512 digest algorithm"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
SHA512 secure hash standard (DFIPS 180-2).
@@ -301,8 +327,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_WP512
prompt "kmod-crypto-whirlpool................ Whirlpool digest algorithms"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
Whirlpool hash algorithm 512, 384 and 256-bit hashes
@@ -316,8 +342,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TGR192
prompt "kmod-crypto-tiger.................... Tiger digest algorithms"
tristate
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
- select ADK_KPACKAGE_KMOD_CRYPTO_HASH
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
help
Tiger hash algorithm 192, 160 and 128-bit hashes
@@ -327,7 +353,6 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TGR192
See also:
<http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
-
endmenu
menu "Cipher algoritms"
@@ -335,9 +360,9 @@ menu "Cipher algoritms"
config ADK_KPACKAGE_KMOD_CRYPTO_AES
prompt "kmod-crypto-aes...................... AES cipher algorithms"
tristate
- default n
depends on !ADK_KERNEL_CRYPTO_AES
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ default n
help
AES cipher algorithms (FIPS-197). AES uses the Rijndael
algorithm.
@@ -358,9 +383,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES
config ADK_KPACKAGE_KMOD_CRYPTO_AES_586
prompt "kmod-crypto-aes-i586................. AES cipher algorithms (i586)"
tristate
- default n
depends on ADK_x86
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
+ default n
help
AES cipher algorithms (FIPS-197). AES uses the Rijndael
algorithm.
@@ -381,8 +406,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES_586
config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS
prompt "kmod-crypto-anubis................... Anubis cipher algorithm"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
Anubis cipher algorithm.
@@ -397,8 +422,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS
config ADK_KPACKAGE_KMOD_CRYPTO_ARC4
prompt "kmod-crypto-arc4..................... ARC4 cipher algorithm"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
ARC4 cipher algorithm.
@@ -411,8 +436,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ARC4
config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH
prompt "kmod-crypto-blowfish................. Blowfish cipher algorithm"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
Blowfish cipher algorithm, by Bruce Schneier.
@@ -426,8 +451,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH
config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA
prompt "kmod-crypto-camellia................. Camellia cipher algorithms"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
default n
- select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
Camellia cipher algorithms module.
@@ -442,8 +467,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA
config ADK_KPACKAGE_KMOD_CRYPTO_CAST5
prompt "kmod-crypto-cast5.................... CAST5 (CAST-128) cipher algorithm"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2