Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35424f63 authored by Holger Dengler's avatar Holger Dengler Committed by Martin Schwidefsky
Browse files

[S390] Remove monolithic build option for zcrypt driver. 



Remove the option to build a single module z90crypt that contains
ap bus, request router and card drivers.

Signed-off-by: default avatarHolger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ddadfa8d

drivers/crypto/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ config CRYPTO_DEV_GEODE 
config ZCRYPT

	tristate "Support for PCI-attached cryptographic adapters"

	depends on S390

	select ZCRYPT_MONOLITHIC if ZCRYPT="y"

	select HW_RANDOM

	help

	  Select this option if you want to use a PCI-attached cryptographic
@@ -77,14 +76,6 @@ config ZCRYPT 
	  + Crypto Express3 Coprocessor (CEX3C)

	  + Crypto Express3 Accelerator (CEX3A)



config ZCRYPT_MONOLITHIC

	bool "Monolithic zcrypt module"

	depends on ZCRYPT

	help

	  Select this option if you want to have a single module z90crypt,

	  that contains all parts of the crypto device driver (ap bus,

	  request router and all the card drivers).



config CRYPTO_SHA1_S390

	tristate "SHA1 digest algorithm"

	depends on S390

drivers/s390/crypto/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -2,16 +2,6 @@ 
# 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/ap_bus.c

+0 −2
Original line number Diff line number Diff line
@@ -1862,7 +1862,5 @@ void ap_module_exit(void) 
	}

}



#ifndef CONFIG_ZCRYPT_MONOLITHIC

module_init(ap_module_init);

module_exit(ap_module_exit);
 
#endif

drivers/s390/crypto/zcrypt_api.c

+0 −2
Original line number Diff line number Diff line
@@ -1220,7 +1220,5 @@ void zcrypt_api_exit(void) 
	misc_deregister(&zcrypt_misc_device);

}



#ifndef CONFIG_ZCRYPT_MONOLITHIC

module_init(zcrypt_api_init);

module_exit(zcrypt_api_exit);
 
#endif

drivers/s390/crypto/zcrypt_cex2a.c

+0 −4
Original line number Diff line number Diff line
@@ -63,13 +63,11 @@ static struct ap_device_id zcrypt_cex2a_ids[] = { 
	{ /* end of list */ },

};



#ifndef CONFIG_ZCRYPT_MONOLITHIC

MODULE_DEVICE_TABLE(ap, zcrypt_cex2a_ids);

MODULE_AUTHOR("IBM Corporation");

MODULE_DESCRIPTION("CEX2A Cryptographic Coprocessor device driver, "

		   "Copyright 2001, 2006 IBM Corporation");

MODULE_LICENSE("GPL");

#endif



static int zcrypt_cex2a_probe(struct ap_device *ap_dev);

static void zcrypt_cex2a_remove(struct ap_device *ap_dev);
@@ -496,7 +494,5 @@ void __exit zcrypt_cex2a_exit(void) 
	ap_driver_unregister(&zcrypt_cex2a_driver);

}



#ifndef CONFIG_ZCRYPT_MONOLITHIC

module_init(zcrypt_cex2a_init);

module_exit(zcrypt_cex2a_exit);
 
#endif