Commit 9330e13e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: reorder defconfig files 



Some Kconfig options have moved around, so adapt the defconfig files
accordingly.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d339b2e6

arch/arm/configs/at91_dt_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_CFB=y

CONFIG_CRYPTO_OFB=y
@@ -224,7 +225,6 @@ CONFIG_CRYPTO_XTS=y 
CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/dove_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ CONFIG_NLS_ISO8859_2=y 
CONFIG_NLS_UTF8=y

CONFIG_TIMER_STATS=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_BLOWFISH=y

CONFIG_CRYPTO_TEA=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y
@@ -124,9 +127,6 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_BLOWFISH=y

CONFIG_CRYPTO_TEA=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_LZO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/exynos_defconfig

+5 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ CONFIG_KERNEL_MODE_NEON=y 
CONFIG_PM_DEBUG=y

CONFIG_PM_ADVANCED_DEBUG=y

CONFIG_ENERGY_MODEL=y

CONFIG_CRYPTO_SHA1_ARM_NEON=m

CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRYPTO_CHACHA20_NEON=m

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -364,6 +359,11 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_SHA1_ARM_NEON=m

CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRYPTO_CHACHA20_NEON=m

CONFIG_CRYPTO_DEV_EXYNOS_RNG=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_CRC_CCITT=y

arch/arm/configs/gemini_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ CONFIG_LOGO=y 
CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_FOTG210_HCD=y

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_FOTG210_HCD=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -416,8 +416,8 @@ CONFIG_PWM_FSL_FTM=y 
CONFIG_PWM_IMX27=y

CONFIG_PWM_IMX_TPM=y

CONFIG_NVMEM_IMX_OCOTP=y

CONFIG_NVMEM_VF610_OCOTP=y

CONFIG_NVMEM_SNVS_LPGPR=y

CONFIG_NVMEM_VF610_OCOTP=y

CONFIG_TEE=y

CONFIG_OPTEE=y

CONFIG_MUX_MMIO=y