Skip to content

Commit 9330e13

Browse files
arndbarndb
committed
ARM: reorder defconfig files
Some Kconfig options have moved around, so adapt the defconfig files accordingly. Signed-off-by: Arnd Bergmann <[email protected]>
1 parent d339b2e commit 9330e13

15 files changed

+65
-65
lines changed

‎arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ CONFIG_NLS_CODEPAGE_437=y
217217
CONFIG_NLS_CODEPAGE_850=y
218218
CONFIG_NLS_ISO8859_1=y
219219
CONFIG_NLS_UTF8=y
220+
CONFIG_CRYPTO_DES=y
220221
CONFIG_CRYPTO_CBC=y
221222
CONFIG_CRYPTO_CFB=y
222223
CONFIG_CRYPTO_OFB=y
223224
CONFIG_CRYPTO_XTS=y
224225
CONFIG_CRYPTO_HMAC=y
225226
CONFIG_CRYPTO_SHA1=y
226227
CONFIG_CRYPTO_SHA512=y
227-
CONFIG_CRYPTO_DES=y
228228
CONFIG_CRYPTO_USER_API_HASH=m
229229
CONFIG_CRYPTO_USER_API_SKCIPHER=m
230230
CONFIG_CRYPTO_DEV_ATMEL_AES=y

‎arch/arm/configs/dove_defconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@ CONFIG_NLS_ISO8859_2=y
117117
CONFIG_NLS_UTF8=y
118118
CONFIG_TIMER_STATS=y
119119
CONFIG_CRYPTO_NULL=y
120+
CONFIG_CRYPTO_BLOWFISH=y
121+
CONFIG_CRYPTO_TEA=y
122+
CONFIG_CRYPTO_TWOFISH=y
120123
CONFIG_CRYPTO_ECB=m
121124
CONFIG_CRYPTO_PCBC=m
122125
CONFIG_CRYPTO_HMAC=y
123126
CONFIG_CRYPTO_MD4=y
124127
CONFIG_CRYPTO_SHA1=y
125128
CONFIG_CRYPTO_SHA256=y
126129
CONFIG_CRYPTO_SHA512=y
127-
CONFIG_CRYPTO_BLOWFISH=y
128-
CONFIG_CRYPTO_TEA=y
129-
CONFIG_CRYPTO_TWOFISH=y
130130
CONFIG_CRYPTO_DEFLATE=y
131131
CONFIG_CRYPTO_LZO=y
132132
# CONFIG_CRYPTO_ANSI_CPRNG is not set

‎arch/arm/configs/exynos_defconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ CONFIG_KERNEL_MODE_NEON=y
3232
CONFIG_PM_DEBUG=y
3333
CONFIG_PM_ADVANCED_DEBUG=y
3434
CONFIG_ENERGY_MODEL=y
35-
CONFIG_CRYPTO_SHA1_ARM_NEON=m
36-
CONFIG_CRYPTO_SHA256_ARM=m
37-
CONFIG_CRYPTO_SHA512_ARM=m
38-
CONFIG_CRYPTO_AES_ARM_BS=m
39-
CONFIG_CRYPTO_CHACHA20_NEON=m
4035
CONFIG_KALLSYMS_ALL=y
4136
CONFIG_MODULES=y
4237
CONFIG_MODULE_UNLOAD=y
@@ -364,6 +359,11 @@ CONFIG_CRYPTO_USER_API_HASH=m
364359
CONFIG_CRYPTO_USER_API_SKCIPHER=m
365360
CONFIG_CRYPTO_USER_API_RNG=m
366361
CONFIG_CRYPTO_USER_API_AEAD=m
362+
CONFIG_CRYPTO_SHA1_ARM_NEON=m
363+
CONFIG_CRYPTO_SHA256_ARM=m
364+
CONFIG_CRYPTO_SHA512_ARM=m
365+
CONFIG_CRYPTO_AES_ARM_BS=m
366+
CONFIG_CRYPTO_CHACHA20_NEON=m
367367
CONFIG_CRYPTO_DEV_EXYNOS_RNG=y
368368
CONFIG_CRYPTO_DEV_S5P=y
369369
CONFIG_CRC_CCITT=y

‎arch/arm/configs/gemini_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ CONFIG_LOGO=y
8383
CONFIG_USB=y
8484
CONFIG_USB_MON=y
8585
CONFIG_USB_EHCI_HCD=y
86-
CONFIG_USB_FOTG210_HCD=y
8786
CONFIG_USB_UHCI_HCD=y
8887
CONFIG_USB_STORAGE=y
88+
CONFIG_USB_FOTG210_HCD=y
8989
CONFIG_NEW_LEDS=y
9090
CONFIG_LEDS_CLASS=y
9191
CONFIG_LEDS_GPIO=y

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ CONFIG_PWM_FSL_FTM=y
416416
CONFIG_PWM_IMX27=y
417417
CONFIG_PWM_IMX_TPM=y
418418
CONFIG_NVMEM_IMX_OCOTP=y
419-
CONFIG_NVMEM_VF610_OCOTP=y
420419
CONFIG_NVMEM_SNVS_LPGPR=y
420+
CONFIG_NVMEM_VF610_OCOTP=y
421421
CONFIG_TEE=y
422422
CONFIG_OPTEE=y
423423
CONFIG_MUX_MMIO=y

‎arch/arm/configs/keystone_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ CONFIG_NLS_CODEPAGE_437=y
225225
CONFIG_NLS_ISO8859_1=y
226226
CONFIG_CRYPTO_USER=y
227227
CONFIG_CRYPTO_AUTHENC=y
228+
CONFIG_CRYPTO_DES=y
228229
CONFIG_CRYPTO_CBC=y
229230
CONFIG_CRYPTO_CTR=y
230231
CONFIG_CRYPTO_XCBC=y
231-
CONFIG_CRYPTO_DES=y
232232
CONFIG_CRYPTO_ANSI_CPRNG=y
233233
CONFIG_CRYPTO_USER_API_HASH=y
234234
CONFIG_CRYPTO_USER_API_SKCIPHER=y

‎arch/arm/configs/milbeaut_m10v_defconfig

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@ CONFIG_ARM_CPUIDLE=y
4444
CONFIG_VFP=y
4545
CONFIG_NEON=y
4646
CONFIG_KERNEL_MODE_NEON=y
47-
CONFIG_CRYPTO_SHA1_ARM_NEON=m
48-
CONFIG_CRYPTO_SHA1_ARM_CE=m
49-
CONFIG_CRYPTO_SHA2_ARM_CE=m
50-
CONFIG_CRYPTO_SHA512_ARM=m
51-
CONFIG_CRYPTO_AES_ARM=m
52-
CONFIG_CRYPTO_AES_ARM_BS=m
53-
CONFIG_CRYPTO_AES_ARM_CE=m
54-
CONFIG_CRYPTO_GHASH_ARM_CE=m
55-
CONFIG_CRYPTO_CRC32_ARM_CE=m
56-
CONFIG_CRYPTO_CHACHA20_NEON=m
5747
CONFIG_MODULES=y
5848
CONFIG_MODULE_UNLOAD=y
5949
CONFIG_PARTITION_ADVANCED=y
@@ -105,9 +95,19 @@ CONFIG_NLS_UTF8=y
10595
CONFIG_KEYS=y
10696
CONFIG_CRYPTO_MANAGER=y
10797
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
108-
CONFIG_CRYPTO_SEQIV=m
10998
# CONFIG_CRYPTO_ECHAINIV is not set
11099
CONFIG_CRYPTO_AES=y
100+
CONFIG_CRYPTO_SEQIV=m
101+
CONFIG_CRYPTO_GHASH_ARM_CE=m
102+
CONFIG_CRYPTO_SHA1_ARM_NEON=m
103+
CONFIG_CRYPTO_SHA1_ARM_CE=m
104+
CONFIG_CRYPTO_SHA2_ARM_CE=m
105+
CONFIG_CRYPTO_SHA512_ARM=m
106+
CONFIG_CRYPTO_AES_ARM=m
107+
CONFIG_CRYPTO_AES_ARM_BS=m
108+
CONFIG_CRYPTO_AES_ARM_CE=m
109+
CONFIG_CRYPTO_CHACHA20_NEON=m
110+
CONFIG_CRYPTO_CRC32_ARM_CE=m
111111
# CONFIG_CRYPTO_HW is not set
112112
CONFIG_CRC_CCITT=m
113113
CONFIG_CRC_ITU_T=m

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,6 @@ CONFIG_ARM_EXYNOS_CPUIDLE=y
132132
CONFIG_ARM_TEGRA_CPUIDLE=y
133133
CONFIG_ARM_QCOM_SPM_CPUIDLE=y
134134
CONFIG_KERNEL_MODE_NEON=y
135-
CONFIG_CRYPTO_SHA1_ARM_NEON=m
136-
CONFIG_CRYPTO_SHA1_ARM_CE=m
137-
CONFIG_CRYPTO_SHA2_ARM_CE=m
138-
CONFIG_CRYPTO_SHA512_ARM=m
139-
CONFIG_CRYPTO_AES_ARM=m
140-
CONFIG_CRYPTO_AES_ARM_BS=m
141-
CONFIG_CRYPTO_AES_ARM_CE=m
142-
CONFIG_CRYPTO_GHASH_ARM_CE=m
143-
CONFIG_CRYPTO_CRC32_ARM_CE=m
144-
CONFIG_CRYPTO_CHACHA20_NEON=m
145135
CONFIG_MODULES=y
146136
CONFIG_MODULE_UNLOAD=y
147137
CONFIG_PARTITION_ADVANCED=y
@@ -444,8 +434,8 @@ CONFIG_SPI_BCM2835AUX=y
444434
CONFIG_SPI_CADENCE=y
445435
CONFIG_SPI_DAVINCI=y
446436
CONFIG_SPI_FSL_QUADSPI=m
447-
CONFIG_SPI_GPIO=m
448437
CONFIG_SPI_GXP=m
438+
CONFIG_SPI_GPIO=m
449439
CONFIG_SPI_FSL_DSPI=m
450440
CONFIG_SPI_OMAP24XX=y
451441
CONFIG_SPI_ORION=y
@@ -1208,13 +1198,13 @@ CONFIG_TI_PIPE3=y
12081198
CONFIG_TWL4030_USB=m
12091199
CONFIG_RAS=y
12101200
CONFIG_NVMEM_IMX_OCOTP=y
1201+
CONFIG_NVMEM_MESON_MX_EFUSE=m
12111202
CONFIG_NVMEM_QCOM_QFPROM=y
1203+
CONFIG_NVMEM_RMEM=m
12121204
CONFIG_NVMEM_ROCKCHIP_EFUSE=m
12131205
CONFIG_NVMEM_STM32_ROMEM=m
12141206
CONFIG_NVMEM_SUNXI_SID=y
12151207
CONFIG_NVMEM_VF610_OCOTP=y
1216-
CONFIG_NVMEM_MESON_MX_EFUSE=m
1217-
CONFIG_NVMEM_RMEM=m
12181208
CONFIG_FSI=m
12191209
CONFIG_FSI_MASTER_GPIO=m
12201210
CONFIG_FSI_MASTER_HUB=m
@@ -1255,6 +1245,16 @@ CONFIG_CRYPTO_USER_API_HASH=m
12551245
CONFIG_CRYPTO_USER_API_SKCIPHER=m
12561246
CONFIG_CRYPTO_USER_API_RNG=m
12571247
CONFIG_CRYPTO_USER_API_AEAD=m
1248+
CONFIG_CRYPTO_GHASH_ARM_CE=m
1249+
CONFIG_CRYPTO_SHA1_ARM_NEON=m
1250+
CONFIG_CRYPTO_SHA1_ARM_CE=m
1251+
CONFIG_CRYPTO_SHA2_ARM_CE=m
1252+
CONFIG_CRYPTO_SHA512_ARM=m
1253+
CONFIG_CRYPTO_AES_ARM=m
1254+
CONFIG_CRYPTO_AES_ARM_BS=m
1255+
CONFIG_CRYPTO_AES_ARM_CE=m
1256+
CONFIG_CRYPTO_CHACHA20_NEON=m
1257+
CONFIG_CRYPTO_CRC32_ARM_CE=m
12581258
CONFIG_CRYPTO_DEV_SUN4I_SS=m
12591259
CONFIG_CRYPTO_DEV_FSL_CAAM=m
12601260
CONFIG_CRYPTO_DEV_EXYNOS_RNG=m

‎arch/arm/configs/mv78xx0_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ CONFIG_CRYPTO_CBC=m
118118
CONFIG_CRYPTO_ECB=m
119119
CONFIG_CRYPTO_PCBC=m
120120
# CONFIG_DEBUG_BUGVERBOSE is not set
121+
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
121122
CONFIG_MAGIC_SYSRQ=y
122123
CONFIG_DEBUG_FS=y
123124
CONFIG_DEBUG_KERNEL=y
124125
# CONFIG_SLUB_DEBUG is not set
125126
CONFIG_SCHEDSTATS=y
126-
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
127127
CONFIG_DEBUG_USER=y
128128
CONFIG_DEBUG_LL=y
129129
# CONFIG_CRYPTO_ANSI_CPRNG is not set

‎arch/arm/configs/nhk8815_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ CONFIG_NLS_CODEPAGE_437=y
131131
CONFIG_NLS_ASCII=y
132132
CONFIG_NLS_ISO8859_1=y
133133
CONFIG_NLS_ISO8859_15=y
134+
CONFIG_CRYPTO_DES=y
134135
CONFIG_CRYPTO_MD5=y
135136
CONFIG_CRYPTO_SHA1=y
136-
CONFIG_CRYPTO_DES=y
137137
# CONFIG_DEBUG_BUGVERBOSE is not set
138138
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
139139
CONFIG_DEBUG_FS=y

0 commit comments

Comments
 (0)