From ea1564bf416c1144b484848b190255da44a42625 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 31 May 2012 17:54:04 +0100 Subject: UBUNTU: [Config] highbank -- commonise ENCRYPTED_KEYS Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/armel/config.common.armel | 2 -- debian.master/config/armhf/config.flavour.highbank | 2 -- debian.master/config/armhf/config.flavour.omap | 2 -- debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/i386/config.common.i386 | 2 -- debian.master/config/powerpc/config.common.powerpc | 2 -- debian.master/config/ppc64/config.common.ppc64 | 2 -- 8 files changed, 2 insertions(+), 14 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4710b07175c..aaa25f8945f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -76,7 +76,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -99,7 +98,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 7a2f79a0fe8..2e46b71391b 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -77,7 +77,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -103,7 +102,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 15122724472..b69c6bba6ca 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -64,7 +64,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CRC7 is not set # CONFIG_CRC8 is not set # CONFIG_CRC_T10DIF is not set -CONFIG_CRYPTO_RNG=m # CONFIG_CUSE is not set CONFIG_DAVICOM_PHY=m # CONFIG_DE600 is not set @@ -86,7 +85,6 @@ CONFIG_DM_RAID45=m CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENC28J60 is not set -# CONFIG_ENCRYPTED_KEYS is not set # CONFIG_ETHOC is not set # CONFIG_EVM is not set # CONFIG_EXPERT is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 7cb29e0a6b3..61544eedde9 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -64,7 +64,6 @@ CONFIG_CRASH_DUMP=y CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -86,7 +85,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a1830f95eb3..896f6561754 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1125,6 +1125,7 @@ CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SALSA20_586=m @@ -1578,6 +1579,7 @@ CONFIG_ELPLUS=m # CONFIG_EMBEDDED is not set # CONFIG_ENC28J60_WRITEVERIFY is not set CONFIG_ENCLOSURE_SERVICES=m +CONFIG_ENCRYPTED_KEYS=y CONFIG_ENIC=m # CONFIG_EPAPR_BOOT is not set CONFIG_EPIC100=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 55399c8e710..10051076ef2 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -76,7 +76,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -99,7 +98,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 165e6c1893f..d2cb6a916bc 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -69,7 +69,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -92,7 +91,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 9ee64cf0deb..d1cc25fd552 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -74,7 +74,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAVICOM_PHY=y CONFIG_DE600=m @@ -97,7 +96,6 @@ CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENC28J60=m -CONFIG_ENCRYPTED_KEYS=y CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y -- cgit v1.2.3