Skip to content

Commit d0e898e

Browse files
pelwellpelwell
committed
configs: Fix up the defconfigs for 6.19
Signed-off-by: Phil Elwell <[email protected]>
1 parent a12650e commit d0e898e

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
lines changed

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
655655
CONFIG_BCM_VCIO=y
656656
# CONFIG_LEGACY_PTYS is not set
657657
CONFIG_SERIAL_8250=y
658-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
659658
CONFIG_SERIAL_8250_CONSOLE=y
660659
# CONFIG_SERIAL_8250_DMA is not set
661660
CONFIG_SERIAL_8250_NR_UARTS=1
@@ -762,7 +761,6 @@ CONFIG_BCM2835_WDT=y
762761
CONFIG_MFD_RASPBERRYPI_POE_HAT=m
763762
CONFIG_MFD_STMPE=y
764763
CONFIG_STMPE_SPI=y
765-
CONFIG_MFD_WL1273_CORE=m
766764
CONFIG_MFD_ARIZONA_I2C=m
767765
CONFIG_MFD_ARIZONA_SPI=m
768766
CONFIG_MFD_WM5102=y
@@ -931,6 +929,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
931929
CONFIG_VIDEO_MUX=m
932930
CONFIG_VIDEO_BCM2835_UNICAM_LEGACY=m
933931
CONFIG_VIDEO_BCM2835_UNICAM=m
932+
CONFIG_VIDEO_ISP_BCM2835=m
934933
CONFIG_VIDEO_ARDUCAM_64MP=m
935934
CONFIG_VIDEO_ARDUCAM_PIVARIETY=m
936935
CONFIG_VIDEO_IMX219=m
@@ -1016,6 +1015,7 @@ CONFIG_SND_OSSEMUL=y
10161015
CONFIG_SND_PCM_OSS=m
10171016
CONFIG_SND_HRTIMER=m
10181017
CONFIG_SND_DYNAMIC_MINORS=y
1018+
CONFIG_SND_SUPPORT_OLD_API=y
10191019
CONFIG_SND_SEQUENCER=m
10201020
CONFIG_SND_SEQ_DUMMY=m
10211021
CONFIG_SND_DUMMY=m
@@ -1403,11 +1403,10 @@ CONFIG_FB_TFT_TLS8204=m
14031403
CONFIG_FB_TFT_UC1611=m
14041404
CONFIG_FB_TFT_UC1701=m
14051405
CONFIG_FB_TFT_UPD161704=m
1406-
CONFIG_BCM2835_VCHIQ=y
14071406
CONFIG_SND_BCM2835=m
14081407
CONFIG_VIDEO_BCM2835=m
14091408
CONFIG_VIDEO_CODEC_BCM2835=m
1410-
CONFIG_VIDEO_ISP_BCM2835=m
1409+
CONFIG_BCM2835_VCHIQ=y
14111410
CONFIG_CLK_RASPBERRYPI=y
14121411
CONFIG_MAILBOX=y
14131412
CONFIG_BCM2835_MBOX=y
@@ -1530,6 +1529,7 @@ CONFIG_NFSD_V2=y
15301529
CONFIG_NFSD_V2_ACL=y
15311530
CONFIG_NFSD_V3_ACL=y
15321531
CONFIG_NFSD_V4=y
1532+
CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
15331533
CONFIG_CEPH_FS=m
15341534
CONFIG_CIFS=m
15351535
CONFIG_CIFS_UPCALL=y

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
649649
CONFIG_BCM_VCIO=y
650650
# CONFIG_LEGACY_PTYS is not set
651651
CONFIG_SERIAL_8250=y
652-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
653652
CONFIG_SERIAL_8250_CONSOLE=y
654653
# CONFIG_SERIAL_8250_DMA is not set
655654
CONFIG_SERIAL_8250_NR_UARTS=1
@@ -755,7 +754,6 @@ CONFIG_BCM2835_WDT=y
755754
CONFIG_MFD_RASPBERRYPI_POE_HAT=m
756755
CONFIG_MFD_STMPE=y
757756
CONFIG_STMPE_SPI=y
758-
CONFIG_MFD_WL1273_CORE=m
759757
CONFIG_MFD_ARIZONA_I2C=m
760758
CONFIG_MFD_ARIZONA_SPI=m
761759
CONFIG_MFD_WM5102=y
@@ -924,6 +922,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
924922
CONFIG_VIDEO_MUX=m
925923
CONFIG_VIDEO_BCM2835_UNICAM_LEGACY=m
926924
CONFIG_VIDEO_BCM2835_UNICAM=m
925+
CONFIG_VIDEO_ISP_BCM2835=m
927926
CONFIG_VIDEO_ARDUCAM_64MP=m
928927
CONFIG_VIDEO_ARDUCAM_PIVARIETY=m
929928
CONFIG_VIDEO_IMX219=m
@@ -1009,6 +1008,7 @@ CONFIG_SND_OSSEMUL=y
10091008
CONFIG_SND_PCM_OSS=m
10101009
CONFIG_SND_HRTIMER=m
10111010
CONFIG_SND_DYNAMIC_MINORS=y
1011+
CONFIG_SND_SUPPORT_OLD_API=y
10121012
CONFIG_SND_SEQUENCER=m
10131013
CONFIG_SND_SEQ_DUMMY=m
10141014
CONFIG_SND_DUMMY=m
@@ -1395,11 +1395,10 @@ CONFIG_FB_TFT_TLS8204=m
13951395
CONFIG_FB_TFT_UC1611=m
13961396
CONFIG_FB_TFT_UC1701=m
13971397
CONFIG_FB_TFT_UPD161704=m
1398-
CONFIG_BCM2835_VCHIQ=y
13991398
CONFIG_SND_BCM2835=m
14001399
CONFIG_VIDEO_BCM2835=m
14011400
CONFIG_VIDEO_CODEC_BCM2835=m
1402-
CONFIG_VIDEO_ISP_BCM2835=m
1401+
CONFIG_BCM2835_VCHIQ=y
14031402
CONFIG_CLK_RASPBERRYPI=y
14041403
CONFIG_MAILBOX=y
14051404
CONFIG_BCM2835_MBOX=y
@@ -1521,6 +1520,7 @@ CONFIG_NFSD_V2=y
15211520
CONFIG_NFSD_V2_ACL=y
15221521
CONFIG_NFSD_V3_ACL=y
15231522
CONFIG_NFSD_V4=y
1523+
CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
15241524
CONFIG_CEPH_FS=m
15251525
CONFIG_CIFS=m
15261526
CONFIG_CIFS_UPCALL=y

‎arch/arm64/configs/bcm2711_defconfig‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
724724
CONFIG_BCM_VCIO=y
725725
# CONFIG_LEGACY_PTYS is not set
726726
CONFIG_SERIAL_8250=y
727-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
728727
CONFIG_SERIAL_8250_CONSOLE=y
729728
# CONFIG_SERIAL_8250_DMA is not set
730729
CONFIG_SERIAL_8250_NR_UARTS=5
@@ -844,7 +843,6 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
844843
CONFIG_MFD_STMPE=y
845844
CONFIG_STMPE_SPI=y
846845
CONFIG_MFD_SYSCON=y
847-
CONFIG_MFD_WL1273_CORE=m
848846
CONFIG_MFD_ARIZONA_I2C=m
849847
CONFIG_MFD_ARIZONA_SPI=m
850848
CONFIG_MFD_WM5102=y
@@ -1016,6 +1014,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
10161014
CONFIG_VIDEO_MUX=m
10171015
CONFIG_VIDEO_BCM2835_UNICAM_LEGACY=m
10181016
CONFIG_VIDEO_BCM2835_UNICAM=m
1017+
CONFIG_VIDEO_ISP_BCM2835=m
10191018
CONFIG_VIDEO_RPI_HEVC_DEC=m
10201019
CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
10211020
CONFIG_VIDEO_RP1_CFE=m
@@ -1116,6 +1115,7 @@ CONFIG_SND_OSSEMUL=y
11161115
CONFIG_SND_PCM_OSS=m
11171116
CONFIG_SND_HRTIMER=m
11181117
CONFIG_SND_DYNAMIC_MINORS=y
1118+
CONFIG_SND_SUPPORT_OLD_API=y
11191119
CONFIG_SND_SEQUENCER=m
11201120
CONFIG_SND_SEQ_DUMMY=m
11211121
CONFIG_SND_DUMMY=m
@@ -1516,11 +1516,10 @@ CONFIG_FB_TFT_TLS8204=m
15161516
CONFIG_FB_TFT_UC1611=m
15171517
CONFIG_FB_TFT_UC1701=m
15181518
CONFIG_FB_TFT_UPD161704=m
1519-
CONFIG_BCM2835_VCHIQ=y
15201519
CONFIG_SND_BCM2835=m
15211520
CONFIG_VIDEO_BCM2835=m
15221521
CONFIG_VIDEO_CODEC_BCM2835=m
1523-
CONFIG_VIDEO_ISP_BCM2835=m
1522+
CONFIG_BCM2835_VCHIQ=y
15241523
CONFIG_COMMON_CLK_RP1=y
15251524
CONFIG_COMMON_CLK_RP1_SDIO=y
15261525
CONFIG_CLK_RASPBERRYPI=y
@@ -1653,6 +1652,7 @@ CONFIG_NFSD_V2=y
16531652
CONFIG_NFSD_V2_ACL=y
16541653
CONFIG_NFSD_V3_ACL=y
16551654
CONFIG_NFSD_V4=y
1655+
CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
16561656
CONFIG_CEPH_FS=m
16571657
CONFIG_CIFS=m
16581658
CONFIG_CIFS_UPCALL=y
@@ -1726,7 +1726,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
17261726
CONFIG_CRYPTO_USER_API_AEAD=m
17271727
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17281728
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1729-
CONFIG_CRYPTO_SHA3_ARM64=m
17301729
CONFIG_CRYPTO_SM3_ARM64_CE=m
17311730
CONFIG_CRYPTO_AES_ARM64=m
17321731
CONFIG_CRYPTO_AES_ARM64_BS=m

‎arch/arm64/configs/bcm2711_rt_defconfig‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
724724
CONFIG_BCM_VCIO=y
725725
# CONFIG_LEGACY_PTYS is not set
726726
CONFIG_SERIAL_8250=y
727-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
728727
CONFIG_SERIAL_8250_CONSOLE=y
729728
# CONFIG_SERIAL_8250_DMA is not set
730729
CONFIG_SERIAL_8250_NR_UARTS=5
@@ -844,7 +843,6 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
844843
CONFIG_MFD_STMPE=y
845844
CONFIG_STMPE_SPI=y
846845
CONFIG_MFD_SYSCON=y
847-
CONFIG_MFD_WL1273_CORE=m
848846
CONFIG_MFD_ARIZONA_I2C=m
849847
CONFIG_MFD_ARIZONA_SPI=m
850848
CONFIG_MFD_WM5102=y
@@ -1015,6 +1013,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
10151013
CONFIG_VIDEO_MUX=m
10161014
CONFIG_VIDEO_BCM2835_UNICAM_LEGACY=m
10171015
CONFIG_VIDEO_BCM2835_UNICAM=m
1016+
CONFIG_VIDEO_ISP_BCM2835=m
10181017
CONFIG_VIDEO_RPI_HEVC_DEC=m
10191018
CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
10201019
CONFIG_VIDEO_RP1_CFE=m
@@ -1115,6 +1114,7 @@ CONFIG_SND_OSSEMUL=y
11151114
CONFIG_SND_PCM_OSS=m
11161115
CONFIG_SND_HRTIMER=m
11171116
CONFIG_SND_DYNAMIC_MINORS=y
1117+
CONFIG_SND_SUPPORT_OLD_API=y
11181118
CONFIG_SND_SEQUENCER=m
11191119
CONFIG_SND_SEQ_DUMMY=m
11201120
CONFIG_SND_DUMMY=m
@@ -1514,11 +1514,10 @@ CONFIG_FB_TFT_TLS8204=m
15141514
CONFIG_FB_TFT_UC1611=m
15151515
CONFIG_FB_TFT_UC1701=m
15161516
CONFIG_FB_TFT_UPD161704=m
1517-
CONFIG_BCM2835_VCHIQ=y
15181517
CONFIG_SND_BCM2835=m
15191518
CONFIG_VIDEO_BCM2835=m
15201519
CONFIG_VIDEO_CODEC_BCM2835=m
1521-
CONFIG_VIDEO_ISP_BCM2835=m
1520+
CONFIG_BCM2835_VCHIQ=y
15221521
CONFIG_COMMON_CLK_RP1=y
15231522
CONFIG_COMMON_CLK_RP1_SDIO=y
15241523
CONFIG_CLK_RASPBERRYPI=y
@@ -1651,6 +1650,7 @@ CONFIG_NFSD_V2=y
16511650
CONFIG_NFSD_V2_ACL=y
16521651
CONFIG_NFSD_V3_ACL=y
16531652
CONFIG_NFSD_V4=y
1653+
CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
16541654
CONFIG_CEPH_FS=m
16551655
CONFIG_CIFS=m
16561656
CONFIG_CIFS_UPCALL=y
@@ -1724,7 +1724,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
17241724
CONFIG_CRYPTO_USER_API_AEAD=m
17251725
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17261726
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1727-
CONFIG_CRYPTO_SHA3_ARM64=m
17281727
CONFIG_CRYPTO_SM3_ARM64_CE=m
17291728
CONFIG_CRYPTO_AES_ARM64=m
17301729
CONFIG_CRYPTO_AES_ARM64_BS=m

‎arch/arm64/configs/bcm2712_defconfig‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
727727
CONFIG_BCM_VCIO=y
728728
# CONFIG_LEGACY_PTYS is not set
729729
CONFIG_SERIAL_8250=y
730-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
731730
CONFIG_SERIAL_8250_CONSOLE=y
732731
# CONFIG_SERIAL_8250_DMA is not set
733732
CONFIG_SERIAL_8250_NR_UARTS=5
@@ -846,7 +845,6 @@ CONFIG_MFD_RASPBERRYPI_POE_HAT=m
846845
CONFIG_MFD_STMPE=y
847846
CONFIG_STMPE_SPI=y
848847
CONFIG_MFD_SYSCON=y
849-
CONFIG_MFD_WL1273_CORE=m
850848
CONFIG_MFD_ARIZONA_I2C=m
851849
CONFIG_MFD_ARIZONA_SPI=m
852850
CONFIG_MFD_WM5102=y
@@ -1018,6 +1016,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
10181016
CONFIG_VIDEO_MUX=m
10191017
CONFIG_VIDEO_BCM2835_UNICAM_LEGACY=m
10201018
CONFIG_VIDEO_BCM2835_UNICAM=m
1019+
CONFIG_VIDEO_ISP_BCM2835=m
10211020
CONFIG_VIDEO_RPI_HEVC_DEC=m
10221021
CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
10231022
CONFIG_VIDEO_RP1_CFE=m
@@ -1118,6 +1117,7 @@ CONFIG_SND_OSSEMUL=y
11181117
CONFIG_SND_PCM_OSS=m
11191118
CONFIG_SND_HRTIMER=m
11201119
CONFIG_SND_DYNAMIC_MINORS=y
1120+
CONFIG_SND_SUPPORT_OLD_API=y
11211121
CONFIG_SND_SEQUENCER=m
11221122
CONFIG_SND_SEQ_DUMMY=m
11231123
CONFIG_SND_DUMMY=m
@@ -1518,11 +1518,10 @@ CONFIG_FB_TFT_TLS8204=m
15181518
CONFIG_FB_TFT_UC1611=m
15191519
CONFIG_FB_TFT_UC1701=m
15201520
CONFIG_FB_TFT_UPD161704=m
1521-
CONFIG_BCM2835_VCHIQ=y
15221521
CONFIG_SND_BCM2835=m
15231522
CONFIG_VIDEO_BCM2835=m
15241523
CONFIG_VIDEO_CODEC_BCM2835=m
1525-
CONFIG_VIDEO_ISP_BCM2835=m
1524+
CONFIG_BCM2835_VCHIQ=y
15261525
CONFIG_COMMON_CLK_RP1=y
15271526
CONFIG_COMMON_CLK_RP1_SDIO=y
15281527
CONFIG_CLK_RASPBERRYPI=y
@@ -1655,6 +1654,7 @@ CONFIG_NFSD_V2=y
16551654
CONFIG_NFSD_V2_ACL=y
16561655
CONFIG_NFSD_V3_ACL=y
16571656
CONFIG_NFSD_V4=y
1657+
CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
16581658
CONFIG_CEPH_FS=m
16591659
CONFIG_CIFS=m
16601660
CONFIG_CIFS_UPCALL=y
@@ -1728,7 +1728,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
17281728
CONFIG_CRYPTO_USER_API_AEAD=m
17291729
CONFIG_CRYPTO_NHPOLY1305_NEON=m
17301730
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1731-
CONFIG_CRYPTO_SHA3_ARM64=m
17321731
CONFIG_CRYPTO_SM3_ARM64_CE=m
17331732
CONFIG_CRYPTO_AES_ARM64=m
17341733
CONFIG_CRYPTO_AES_ARM64_BS=m

0 commit comments

Comments
 (0)