Skip to content

Commit a5bd093

Browse files
tlendackyherbertx
authored andcommitted
crypto: ccp - Update CCP build support
Add HAS_IOMEM as a Kconfig dependency. Always include ccp-platform.c in the CCP build and conditionally include ccp-pci.c. Signed-off-by: Tom Lendacky <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 8db8846 commit a5bd093

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

drivers/crypto/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ config CRYPTO_DEV_ATMEL_SHA
391391

392392
config CRYPTO_DEV_CCP
393393
bool "Support for AMD Cryptographic Coprocessor"
394-
depends on (X86 && PCI) || ARM64
394+
depends on ((X86 && PCI) || ARM64) && HAS_IOMEM
395395
default n
396396
help
397397
The AMD Cryptographic Coprocessor provides hardware support

drivers/crypto/ccp/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
obj-$(CONFIG_CRYPTO_DEV_CCP_DD) += ccp.o
2-
ccp-objs := ccp-dev.o ccp-ops.o
3-
ifdef CONFIG_X86
4-
ccp-objs += ccp-pci.o
5-
endif
6-
ifdef CONFIG_ARM64
7-
ccp-objs += ccp-platform.o
8-
endif
2+
ccp-objs := ccp-dev.o ccp-ops.o ccp-platform.o
3+
ccp-$(CONFIG_PCI) += ccp-pci.o
94

105
obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o
116
ccp-crypto-objs := ccp-crypto-main.o \

0 commit comments

Comments
 (0)