Skip to contentSkip to conversation

s390: zcrypt driver Makefile, Kconfig and monolithic build.

PATCH New Martin Schwidefsky 1 participant 1 message Jul 4, 2006

Subsystems (2)
s390 s390 zcrypt and pkey driver and AP bus
lore
Share & tools
lore

Martin Schwidefsky

author
#0 lore raw

PATCH 5/6 s390: zcrypt driver Makefile, Kconfig and monolithic build.

From: Martin Schwidefsky <[email protected]>
From: Ralph Wuerthner <[email protected]>
From: Cornelia Huck <[email protected]>

[patch 5/6] s390: zcrypt driver Makefile, Kconfig and monolithic build.

The Makefile and Kconfig changes should be obvious. The monolithic build option is there to create an old-style z90crypt module for backward compatability to older distributions.

Signed-off-by Martin Schwidefsky <[email protected]>

---

 drivers/s390/Kconfig              |   20 +++++++
 drivers/s390/crypto/Makefile      |   13 ++++
 drivers/s390/crypto/zcrypt_mono.c |  100 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+)
drivers/s390/crypto/Makefile +13 -0
diff -urpN linux-2.6/drivers/s390/crypto/Makefile linux-2.6-patched/drivers/s390/crypto/Makefile
@@ -2,3 +2,16 @@
 # S/390 crypto devices
 #
 
+ifdef CONFIG_ZCRYPT_MONOLITHIC
+
+z90crypt-objs := zcrypt_mono.o ap_bus.o zcrypt_api.o \
+		zcrypt_pcica.o zcrypt_pcicc.o zcrypt_pcixcc.o zcrypt_cex2a.o
+obj-$(CONFIG_ZCRYPT) += z90crypt.o
+
+else
+
+ap-objs := ap_bus.o
+obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o
+obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o
+
+endif
drivers/s390/crypto/zcrypt_mono.c +100 -0

100 lines not on this page · raw message

drivers/s390/Kconfig +20 -0
diff -urpN linux-2.6/drivers/s390/Kconfig linux-2.6-patched/drivers/s390/Kconfig
@@ -217,4 +217,24 @@ endmenu
 
 menu "Cryptographic devices"
 
+config ZCRYPT
+	tristate "Support for PCI-attached cryptographic adapters"
+	default "m"
+	help
+	  Select this option if you want to use a PCI-attached cryptographic
+	  adapter like:
+	  + PCI Cryptographic Accelerator (PCICA)
+	  + PCI Cryptographic Coprocessor (PCICC)
+	  + PCI-X Cryptographic Coprocessor (PCIXCC)
+	  + Crypto Express2 Coprocessor (CEX2C)
+	  + Crypto Express2 Accelerator (CEX2A)
+
+config ZCRYPT_MONOLITHIC
+	bool "Monolithic zcrypt module"
+	depends on ZCRYPT
+	help
+	  Select this option if you want to have a single module z90crypt.ko
+	  that contains all parts of the crypto device driver (ap bus,
+	  request router and all the card drivers).
+
 endmenu