Skip to content

Commit 5861d5a

Browse files
pelwellpelwell
committed
configs: Restore some dropped config settings
Signed-off-by: Phil Elwell <[email protected]>
1 parent 3237b51 commit 5861d5a

File tree

5 files changed

+23
-32
lines changed

5 files changed

+23
-32
lines changed

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ CONFIG_NEON=y
5656
CONFIG_KERNEL_MODE_NEON=y
5757
# CONFIG_SUSPEND is not set
5858
CONFIG_PM=y
59-
CONFIG_JUMP_LABEL=y
6059
CONFIG_MODULES=y
6160
CONFIG_MODULE_UNLOAD=y
6261
CONFIG_MODVERSIONS=y
@@ -308,7 +307,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
308307
CONFIG_BRIDGE_EBT_LOG=m
309308
CONFIG_BRIDGE_EBT_NFLOG=m
310309
CONFIG_IP_SCTP=m
311-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
312310
CONFIG_ATM=m
313311
CONFIG_L2TP=m
314312
CONFIG_L2TP_V3=y
@@ -608,7 +606,6 @@ CONFIG_INPUT_JOYDEV=m
608606
CONFIG_INPUT_EVDEV=y
609607
# CONFIG_KEYBOARD_ATKBD is not set
610608
CONFIG_KEYBOARD_GPIO=m
611-
CONFIG_KEYBOARD_TCA6416=m
612609
CONFIG_KEYBOARD_TCA8418=m
613610
CONFIG_KEYBOARD_MATRIX=m
614611
CONFIG_KEYBOARD_CAP11XX=m
@@ -761,6 +758,7 @@ CONFIG_BCM2835_WDT=y
761758
CONFIG_MFD_RASPBERRYPI_POE_HAT=m
762759
CONFIG_MFD_STMPE=y
763760
CONFIG_STMPE_SPI=y
761+
CONFIG_MFD_WL1273_CORE=m
764762
CONFIG_MFD_ARIZONA_I2C=m
765763
CONFIG_MFD_ARIZONA_SPI=m
766764
CONFIG_MFD_WM5102=y
@@ -917,7 +915,6 @@ CONFIG_RADIO_SHARK2=m
917915
CONFIG_RADIO_SI4713=m
918916
CONFIG_RADIO_TEA5764=m
919917
CONFIG_RADIO_TEF6862=m
920-
CONFIG_RADIO_WL1273=m
921918
CONFIG_USB_DSBR=m
922919
CONFIG_USB_KEENE=m
923920
CONFIG_USB_MA901=m
@@ -1464,6 +1461,8 @@ CONFIG_JFS_POSIX_ACL=y
14641461
CONFIG_JFS_SECURITY=y
14651462
CONFIG_JFS_STATISTICS=y
14661463
CONFIG_XFS_FS=m
1464+
CONFIG_XFS_SUPPORT_V4=y
1465+
CONFIG_XFS_SUPPORT_ASCII_CI=y
14671466
CONFIG_XFS_QUOTA=y
14681467
CONFIG_XFS_POSIX_ACL=y
14691468
CONFIG_XFS_RT=y
@@ -1474,9 +1473,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
14741473
CONFIG_NILFS2_FS=m
14751474
CONFIG_F2FS_FS=y
14761475
CONFIG_F2FS_FS_SECURITY=y
1477-
CONFIG_BCACHEFS_FS=m
1478-
CONFIG_BCACHEFS_QUOTA=y
1479-
CONFIG_BCACHEFS_POSIX_ACL=y
14801476
CONFIG_FS_ENCRYPTION=y
14811477
CONFIG_FANOTIFY=y
14821478
CONFIG_QFMT_V1=m
@@ -1590,6 +1586,7 @@ CONFIG_CRYPTO_TWOFISH=m
15901586
CONFIG_CRYPTO_ADIANTUM=m
15911587
CONFIG_CRYPTO_CHACHA20POLY1305=m
15921588
CONFIG_CRYPTO_MD4=m
1589+
CONFIG_CRYPTO_SHA1=m
15931590
CONFIG_CRYPTO_WP512=m
15941591
CONFIG_CRYPTO_XCBC=m
15951592
CONFIG_CRYPTO_LZ4=m

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
5050
CONFIG_VFP=y
5151
# CONFIG_SUSPEND is not set
5252
CONFIG_PM=y
53-
CONFIG_JUMP_LABEL=y
5453
CONFIG_MODULES=y
5554
CONFIG_MODULE_UNLOAD=y
5655
CONFIG_MODVERSIONS=y
@@ -302,7 +301,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
302301
CONFIG_BRIDGE_EBT_LOG=m
303302
CONFIG_BRIDGE_EBT_NFLOG=m
304303
CONFIG_IP_SCTP=m
305-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
306304
CONFIG_ATM=m
307305
CONFIG_L2TP=m
308306
CONFIG_L2TP_V3=y
@@ -602,7 +600,6 @@ CONFIG_INPUT_JOYDEV=m
602600
CONFIG_INPUT_EVDEV=y
603601
# CONFIG_KEYBOARD_ATKBD is not set
604602
CONFIG_KEYBOARD_GPIO=m
605-
CONFIG_KEYBOARD_TCA6416=m
606603
CONFIG_KEYBOARD_TCA8418=m
607604
CONFIG_KEYBOARD_MATRIX=m
608605
CONFIG_KEYBOARD_CAP11XX=m
@@ -754,6 +751,7 @@ CONFIG_BCM2835_WDT=y
754751
CONFIG_MFD_RASPBERRYPI_POE_HAT=m
755752
CONFIG_MFD_STMPE=y
756753
CONFIG_STMPE_SPI=y
754+
CONFIG_MFD_WL1273_CORE=m
757755
CONFIG_MFD_ARIZONA_I2C=m
758756
CONFIG_MFD_ARIZONA_SPI=m
759757
CONFIG_MFD_WM5102=y
@@ -910,7 +908,6 @@ CONFIG_RADIO_SHARK2=m
910908
CONFIG_RADIO_SI4713=m
911909
CONFIG_RADIO_TEA5764=m
912910
CONFIG_RADIO_TEF6862=m
913-
CONFIG_RADIO_WL1273=m
914911
CONFIG_USB_DSBR=m
915912
CONFIG_USB_KEENE=m
916913
CONFIG_USB_MA901=m
@@ -1456,6 +1453,8 @@ CONFIG_JFS_POSIX_ACL=y
14561453
CONFIG_JFS_SECURITY=y
14571454
CONFIG_JFS_STATISTICS=y
14581455
CONFIG_XFS_FS=m
1456+
CONFIG_XFS_SUPPORT_V4=y
1457+
CONFIG_XFS_SUPPORT_ASCII_CI=y
14591458
CONFIG_XFS_QUOTA=y
14601459
CONFIG_XFS_POSIX_ACL=y
14611460
CONFIG_XFS_RT=y
@@ -1466,9 +1465,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
14661465
CONFIG_NILFS2_FS=m
14671466
CONFIG_F2FS_FS=y
14681467
CONFIG_F2FS_FS_SECURITY=y
1469-
CONFIG_BCACHEFS_FS=m
1470-
CONFIG_BCACHEFS_QUOTA=y
1471-
CONFIG_BCACHEFS_POSIX_ACL=y
14721468
CONFIG_FANOTIFY=y
14731469
CONFIG_QFMT_V1=m
14741470
CONFIG_QFMT_V2=m
@@ -1584,6 +1580,7 @@ CONFIG_CRYPTO_CTS=m
15841580
CONFIG_CRYPTO_XTS=m
15851581
CONFIG_CRYPTO_CHACHA20POLY1305=m
15861582
CONFIG_CRYPTO_MD4=m
1583+
CONFIG_CRYPTO_SHA1=m
15871584
CONFIG_CRYPTO_WP512=m
15881585
CONFIG_CRYPTO_XCBC=m
15891586
CONFIG_CRYPTO_LZ4=m

‎arch/arm64/configs/bcm2711_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
329329
CONFIG_BRIDGE_EBT_LOG=m
330330
CONFIG_BRIDGE_EBT_NFLOG=m
331331
CONFIG_IP_SCTP=m
332-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
333332
CONFIG_ATM=m
334333
CONFIG_L2TP=m
335334
CONFIG_L2TP_V3=y
@@ -676,7 +675,6 @@ CONFIG_INPUT_JOYDEV=m
676675
CONFIG_INPUT_EVDEV=y
677676
# CONFIG_KEYBOARD_ATKBD is not set
678677
CONFIG_KEYBOARD_GPIO=m
679-
CONFIG_KEYBOARD_TCA6416=m
680678
CONFIG_KEYBOARD_TCA8418=m
681679
CONFIG_KEYBOARD_MATRIX=m
682680
CONFIG_KEYBOARD_CAP11XX=m
@@ -772,6 +770,7 @@ CONFIG_PPS_CLIENT_LDISC=m
772770
CONFIG_PPS_CLIENT_GPIO=m
773771
CONFIG_PINCTRL_MCP23S08=m
774772
CONFIG_PINCTRL_RP1=y
773+
CONFIG_PINCTRL_BRCMSTB=y
775774
CONFIG_PINCTRL_BCM2712=y
776775
CONFIG_GPIO_SYSFS=y
777776
CONFIG_GPIO_BCM_VIRT=y
@@ -842,6 +841,7 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
842841
CONFIG_MFD_STMPE=y
843842
CONFIG_STMPE_SPI=y
844843
CONFIG_MFD_SYSCON=y
844+
CONFIG_MFD_WL1273_CORE=m
845845
CONFIG_MFD_ARIZONA_I2C=m
846846
CONFIG_MFD_ARIZONA_SPI=m
847847
CONFIG_MFD_WM5102=y
@@ -1002,7 +1002,6 @@ CONFIG_RADIO_SHARK2=m
10021002
CONFIG_RADIO_SI4713=m
10031003
CONFIG_RADIO_TEA5764=m
10041004
CONFIG_RADIO_TEF6862=m
1005-
CONFIG_RADIO_WL1273=m
10061005
CONFIG_USB_DSBR=m
10071006
CONFIG_USB_KEENE=m
10081007
CONFIG_USB_MA901=m
@@ -1587,6 +1586,8 @@ CONFIG_JFS_POSIX_ACL=y
15871586
CONFIG_JFS_SECURITY=y
15881587
CONFIG_JFS_STATISTICS=y
15891588
CONFIG_XFS_FS=m
1589+
CONFIG_XFS_SUPPORT_V4=y
1590+
CONFIG_XFS_SUPPORT_ASCII_CI=y
15901591
CONFIG_XFS_QUOTA=y
15911592
CONFIG_XFS_POSIX_ACL=y
15921593
CONFIG_XFS_RT=y
@@ -1597,9 +1598,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
15971598
CONFIG_NILFS2_FS=m
15981599
CONFIG_F2FS_FS=y
15991600
CONFIG_F2FS_FS_SECURITY=y
1600-
CONFIG_BCACHEFS_FS=m
1601-
CONFIG_BCACHEFS_QUOTA=y
1602-
CONFIG_BCACHEFS_POSIX_ACL=y
16031601
CONFIG_FS_ENCRYPTION=y
16041602
CONFIG_FANOTIFY=y
16051603
CONFIG_QFMT_V1=m
@@ -1714,6 +1712,7 @@ CONFIG_CRYPTO_TWOFISH=m
17141712
CONFIG_CRYPTO_ADIANTUM=m
17151713
CONFIG_CRYPTO_CHACHA20POLY1305=m
17161714
CONFIG_CRYPTO_MD4=m
1715+
CONFIG_CRYPTO_SHA1=m
17171716
CONFIG_CRYPTO_WP512=m
17181717
CONFIG_CRYPTO_XCBC=m
17191718
CONFIG_CRYPTO_LZ4=m

‎arch/arm64/configs/bcm2711_rt_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
329329
CONFIG_BRIDGE_EBT_LOG=m
330330
CONFIG_BRIDGE_EBT_NFLOG=m
331331
CONFIG_IP_SCTP=m
332-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
333332
CONFIG_ATM=m
334333
CONFIG_L2TP=m
335334
CONFIG_L2TP_V3=y
@@ -676,7 +675,6 @@ CONFIG_INPUT_JOYDEV=m
676675
CONFIG_INPUT_EVDEV=y
677676
# CONFIG_KEYBOARD_ATKBD is not set
678677
CONFIG_KEYBOARD_GPIO=m
679-
CONFIG_KEYBOARD_TCA6416=m
680678
CONFIG_KEYBOARD_TCA8418=m
681679
CONFIG_KEYBOARD_MATRIX=m
682680
CONFIG_KEYBOARD_CAP11XX=m
@@ -772,6 +770,7 @@ CONFIG_PPS_CLIENT_LDISC=m
772770
CONFIG_PPS_CLIENT_GPIO=m
773771
CONFIG_PINCTRL_MCP23S08=m
774772
CONFIG_PINCTRL_RP1=y
773+
CONFIG_PINCTRL_BRCMSTB=y
775774
CONFIG_PINCTRL_BCM2712=y
776775
CONFIG_GPIO_SYSFS=y
777776
CONFIG_GPIO_BCM_VIRT=y
@@ -842,6 +841,7 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
842841
CONFIG_MFD_STMPE=y
843842
CONFIG_STMPE_SPI=y
844843
CONFIG_MFD_SYSCON=y
844+
CONFIG_MFD_WL1273_CORE=m
845845
CONFIG_MFD_ARIZONA_I2C=m
846846
CONFIG_MFD_ARIZONA_SPI=m
847847
CONFIG_MFD_WM5102=y
@@ -1001,7 +1001,6 @@ CONFIG_RADIO_SHARK2=m
10011001
CONFIG_RADIO_SI4713=m
10021002
CONFIG_RADIO_TEA5764=m
10031003
CONFIG_RADIO_TEF6862=m
1004-
CONFIG_RADIO_WL1273=m
10051004
CONFIG_USB_DSBR=m
10061005
CONFIG_USB_KEENE=m
10071006
CONFIG_USB_MA901=m
@@ -1585,6 +1584,8 @@ CONFIG_JFS_POSIX_ACL=y
15851584
CONFIG_JFS_SECURITY=y
15861585
CONFIG_JFS_STATISTICS=y
15871586
CONFIG_XFS_FS=m
1587+
CONFIG_XFS_SUPPORT_V4=y
1588+
CONFIG_XFS_SUPPORT_ASCII_CI=y
15881589
CONFIG_XFS_QUOTA=y
15891590
CONFIG_XFS_POSIX_ACL=y
15901591
CONFIG_XFS_RT=y
@@ -1595,9 +1596,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
15951596
CONFIG_NILFS2_FS=m
15961597
CONFIG_F2FS_FS=y
15971598
CONFIG_F2FS_FS_SECURITY=y
1598-
CONFIG_BCACHEFS_FS=m
1599-
CONFIG_BCACHEFS_QUOTA=y
1600-
CONFIG_BCACHEFS_POSIX_ACL=y
16011599
CONFIG_FS_ENCRYPTION=y
16021600
CONFIG_FANOTIFY=y
16031601
CONFIG_QFMT_V1=m
@@ -1712,6 +1710,7 @@ CONFIG_CRYPTO_TWOFISH=m
17121710
CONFIG_CRYPTO_ADIANTUM=m
17131711
CONFIG_CRYPTO_CHACHA20POLY1305=m
17141712
CONFIG_CRYPTO_MD4=m
1713+
CONFIG_CRYPTO_SHA1=m
17151714
CONFIG_CRYPTO_WP512=m
17161715
CONFIG_CRYPTO_XCBC=m
17171716
CONFIG_CRYPTO_LZ4=m

‎arch/arm64/configs/bcm2712_defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
332332
CONFIG_BRIDGE_EBT_LOG=m
333333
CONFIG_BRIDGE_EBT_NFLOG=m
334334
CONFIG_IP_SCTP=m
335-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
336335
CONFIG_ATM=m
337336
CONFIG_L2TP=m
338337
CONFIG_L2TP_V3=y
@@ -679,7 +678,6 @@ CONFIG_INPUT_JOYDEV=m
679678
CONFIG_INPUT_EVDEV=y
680679
# CONFIG_KEYBOARD_ATKBD is not set
681680
CONFIG_KEYBOARD_GPIO=m
682-
CONFIG_KEYBOARD_TCA6416=m
683681
CONFIG_KEYBOARD_TCA8418=m
684682
CONFIG_KEYBOARD_MATRIX=m
685683
CONFIG_KEYBOARD_CAP11XX=m
@@ -774,6 +772,7 @@ CONFIG_PPS_CLIENT_LDISC=m
774772
CONFIG_PPS_CLIENT_GPIO=m
775773
CONFIG_PINCTRL_MCP23S08=m
776774
CONFIG_PINCTRL_RP1=y
775+
CONFIG_PINCTRL_BRCMSTB=y
777776
CONFIG_PINCTRL_BCM2712=y
778777
CONFIG_GPIO_SYSFS=y
779778
CONFIG_GPIO_BCM_VIRT=y
@@ -844,6 +843,7 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
844843
CONFIG_MFD_STMPE=y
845844
CONFIG_STMPE_SPI=y
846845
CONFIG_MFD_SYSCON=y
846+
CONFIG_MFD_WL1273_CORE=m
847847
CONFIG_MFD_ARIZONA_I2C=m
848848
CONFIG_MFD_ARIZONA_SPI=m
849849
CONFIG_MFD_WM5102=y
@@ -1004,7 +1004,6 @@ CONFIG_RADIO_SHARK2=m
10041004
CONFIG_RADIO_SI4713=m
10051005
CONFIG_RADIO_TEA5764=m
10061006
CONFIG_RADIO_TEF6862=m
1007-
CONFIG_RADIO_WL1273=m
10081007
CONFIG_USB_DSBR=m
10091008
CONFIG_USB_KEENE=m
10101009
CONFIG_USB_MA901=m
@@ -1589,6 +1588,8 @@ CONFIG_JFS_POSIX_ACL=y
15891588
CONFIG_JFS_SECURITY=y
15901589
CONFIG_JFS_STATISTICS=y
15911590
CONFIG_XFS_FS=m
1591+
CONFIG_XFS_SUPPORT_V4=y
1592+
CONFIG_XFS_SUPPORT_ASCII_CI=y
15921593
CONFIG_XFS_QUOTA=y
15931594
CONFIG_XFS_POSIX_ACL=y
15941595
CONFIG_XFS_RT=y
@@ -1599,9 +1600,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
15991600
CONFIG_NILFS2_FS=m
16001601
CONFIG_F2FS_FS=y
16011602
CONFIG_F2FS_FS_SECURITY=y
1602-
CONFIG_BCACHEFS_FS=m
1603-
CONFIG_BCACHEFS_QUOTA=y
1604-
CONFIG_BCACHEFS_POSIX_ACL=y
16051603
CONFIG_FS_ENCRYPTION=y
16061604
CONFIG_FANOTIFY=y
16071605
CONFIG_QFMT_V1=m
@@ -1716,6 +1714,7 @@ CONFIG_CRYPTO_TWOFISH=m
17161714
CONFIG_CRYPTO_ADIANTUM=m
17171715
CONFIG_CRYPTO_CHACHA20POLY1305=m
17181716
CONFIG_CRYPTO_MD4=m
1717+
CONFIG_CRYPTO_SHA1=m
17191718
CONFIG_CRYPTO_WP512=m
17201719
CONFIG_CRYPTO_XCBC=m
17211720
CONFIG_CRYPTO_LZ4=m

0 commit comments

Comments
 (0)