Skip to content

Commit 28ae262

Browse files
pelwellpelwell
committed
configs: Restore lost defconfig options
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1 parent 5c137be commit 28ae262

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
322322
CONFIG_BRIDGE_EBT_SNAT=m
323323
CONFIG_BRIDGE_EBT_LOG=m
324324
CONFIG_BRIDGE_EBT_NFLOG=m
325+
CONFIG_IP_SCTP=m
325326
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
326327
CONFIG_ATM=m
327328
CONFIG_L2TP=m
@@ -1002,8 +1003,6 @@ CONFIG_TINYDRM_ILI9341=m
10021003
CONFIG_TINYDRM_ILI9486=m
10031004
CONFIG_TINYDRM_MI0283QT=m
10041005
CONFIG_TINYDRM_REPAPER=m
1005-
CONFIG_TINYDRM_ST7586=m
1006-
CONFIG_TINYDRM_ST7735R=m
10071006
CONFIG_DRM_GUD=m
10081007
CONFIG_DRM_SSD130X=m
10091008
CONFIG_DRM_SSD130X_I2C=m
@@ -1590,6 +1589,8 @@ CONFIG_SECURITY=y
15901589
CONFIG_SECURITY_APPARMOR=y
15911590
CONFIG_LSM=""
15921591
CONFIG_CRYPTO_USER=m
1592+
CONFIG_CRYPTO_NULL=m
1593+
CONFIG_CRYPTO_CRYPTD=m
15931594
CONFIG_CRYPTO_CAST5=m
15941595
CONFIG_CRYPTO_DES=y
15951596
CONFIG_CRYPTO_TWOFISH=m

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
316316
CONFIG_BRIDGE_EBT_SNAT=m
317317
CONFIG_BRIDGE_EBT_LOG=m
318318
CONFIG_BRIDGE_EBT_NFLOG=m
319+
CONFIG_IP_SCTP=m
319320
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
320321
CONFIG_ATM=m
321322
CONFIG_L2TP=m
@@ -995,8 +996,6 @@ CONFIG_TINYDRM_ILI9341=m
995996
CONFIG_TINYDRM_ILI9486=m
996997
CONFIG_TINYDRM_MI0283QT=m
997998
CONFIG_TINYDRM_REPAPER=m
998-
CONFIG_TINYDRM_ST7586=m
999-
CONFIG_TINYDRM_ST7735R=m
1000999
CONFIG_DRM_GUD=m
10011000
CONFIG_DRM_SSD130X=m
10021001
CONFIG_DRM_SSD130X_I2C=m
@@ -1581,6 +1580,7 @@ CONFIG_SECURITY=y
15811580
CONFIG_SECURITY_APPARMOR=y
15821581
CONFIG_LSM=""
15831582
CONFIG_CRYPTO_USER=m
1583+
CONFIG_CRYPTO_NULL=m
15841584
CONFIG_CRYPTO_CRYPTD=m
15851585
CONFIG_CRYPTO_CAST5=m
15861586
CONFIG_CRYPTO_DES=y

‎arch/arm64/configs/bcm2711_defconfig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
344344
CONFIG_BRIDGE_EBT_SNAT=m
345345
CONFIG_BRIDGE_EBT_LOG=m
346346
CONFIG_BRIDGE_EBT_NFLOG=m
347+
CONFIG_IP_SCTP=m
347348
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
348349
CONFIG_ATM=m
349350
CONFIG_L2TP=m
@@ -1098,8 +1099,6 @@ CONFIG_TINYDRM_ILI9341=m
10981099
CONFIG_TINYDRM_ILI9486=m
10991100
CONFIG_TINYDRM_MI0283QT=m
11001101
CONFIG_TINYDRM_REPAPER=m
1101-
CONFIG_TINYDRM_ST7586=m
1102-
CONFIG_TINYDRM_ST7735R=m
11031102
CONFIG_DRM_GUD=m
11041103
CONFIG_DRM_SSD130X=m
11051104
CONFIG_DRM_SSD130X_I2C=m
@@ -1709,6 +1708,7 @@ CONFIG_SECURITY=y
17091708
CONFIG_SECURITY_APPARMOR=y
17101709
CONFIG_LSM=""
17111710
CONFIG_CRYPTO_USER=m
1711+
CONFIG_CRYPTO_NULL=m
17121712
CONFIG_CRYPTO_CRYPTD=m
17131713
CONFIG_CRYPTO_CAST5=m
17141714
CONFIG_CRYPTO_DES=y
@@ -1726,7 +1726,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
17261726
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17271727
CONFIG_CRYPTO_GHASH_ARM64_CE=m
17281728
CONFIG_CRYPTO_SHA1_ARM64_CE=m
1729-
CONFIG_CRYPTO_SHA2_ARM64_CE=m
17301729
CONFIG_CRYPTO_SHA512_ARM64_CE=m
17311730
CONFIG_CRYPTO_SHA3_ARM64=m
17321731
CONFIG_CRYPTO_SM3_ARM64_CE=m

‎arch/arm64/configs/bcm2711_rt_defconfig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
344344
CONFIG_BRIDGE_EBT_SNAT=m
345345
CONFIG_BRIDGE_EBT_LOG=m
346346
CONFIG_BRIDGE_EBT_NFLOG=m
347+
CONFIG_IP_SCTP=m
347348
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
348349
CONFIG_ATM=m
349350
CONFIG_L2TP=m
@@ -1097,8 +1098,6 @@ CONFIG_TINYDRM_ILI9341=m
10971098
CONFIG_TINYDRM_ILI9486=m
10981099
CONFIG_TINYDRM_MI0283QT=m
10991100
CONFIG_TINYDRM_REPAPER=m
1100-
CONFIG_TINYDRM_ST7586=m
1101-
CONFIG_TINYDRM_ST7735R=m
11021101
CONFIG_DRM_GUD=m
11031102
CONFIG_DRM_SSD130X=m
11041103
CONFIG_DRM_SSD130X_I2C=m
@@ -1707,6 +1706,7 @@ CONFIG_SECURITY=y
17071706
CONFIG_SECURITY_APPARMOR=y
17081707
CONFIG_LSM=""
17091708
CONFIG_CRYPTO_USER=m
1709+
CONFIG_CRYPTO_NULL=m
17101710
CONFIG_CRYPTO_CRYPTD=m
17111711
CONFIG_CRYPTO_CAST5=m
17121712
CONFIG_CRYPTO_DES=y
@@ -1724,7 +1724,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
17241724
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17251725
CONFIG_CRYPTO_GHASH_ARM64_CE=m
17261726
CONFIG_CRYPTO_SHA1_ARM64_CE=m
1727-
CONFIG_CRYPTO_SHA2_ARM64_CE=m
17281727
CONFIG_CRYPTO_SHA512_ARM64_CE=m
17291728
CONFIG_CRYPTO_SHA3_ARM64=m
17301729
CONFIG_CRYPTO_SM3_ARM64_CE=m

‎arch/arm64/configs/bcm2712_defconfig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
347347
CONFIG_BRIDGE_EBT_SNAT=m
348348
CONFIG_BRIDGE_EBT_LOG=m
349349
CONFIG_BRIDGE_EBT_NFLOG=m
350+
CONFIG_IP_SCTP=m
350351
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
351352
CONFIG_ATM=m
352353
CONFIG_L2TP=m
@@ -1100,8 +1101,6 @@ CONFIG_TINYDRM_ILI9341=m
11001101
CONFIG_TINYDRM_ILI9486=m
11011102
CONFIG_TINYDRM_MI0283QT=m
11021103
CONFIG_TINYDRM_REPAPER=m
1103-
CONFIG_TINYDRM_ST7586=m
1104-
CONFIG_TINYDRM_ST7735R=m
11051104
CONFIG_DRM_GUD=m
11061105
CONFIG_DRM_SSD130X=m
11071106
CONFIG_DRM_SSD130X_I2C=m
@@ -1711,6 +1710,7 @@ CONFIG_SECURITY=y
17111710
CONFIG_SECURITY_APPARMOR=y
17121711
CONFIG_LSM=""
17131712
CONFIG_CRYPTO_USER=m
1713+
CONFIG_CRYPTO_NULL=m
17141714
CONFIG_CRYPTO_CRYPTD=m
17151715
CONFIG_CRYPTO_CAST5=m
17161716
CONFIG_CRYPTO_DES=y
@@ -1728,7 +1728,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
17281728
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17291729
CONFIG_CRYPTO_GHASH_ARM64_CE=m
17301730
CONFIG_CRYPTO_SHA1_ARM64_CE=m
1731-
CONFIG_CRYPTO_SHA2_ARM64_CE=m
17321731
CONFIG_CRYPTO_SHA512_ARM64_CE=m
17331732
CONFIG_CRYPTO_SHA3_ARM64=m
17341733
CONFIG_CRYPTO_SM3_ARM64_CE=m

0 commit comments

Comments
 (0)