Skip to content

Commit 5339245

Browse files
pelwellpelwell
committed
configs: Update the defconfigs for 7.1
Restore a few config settings, and acknowledge the changes to a few others. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1 parent fadb50d commit 5339245

5 files changed

Lines changed: 25 additions & 63 deletions

File tree

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_INET_IPCOMP=m
100100
CONFIG_INET_DIAG=m
101101
CONFIG_TCP_CONG_ADVANCED=y
102102
CONFIG_TCP_CONG_BBR=m
103-
CONFIG_IPV6=y
104103
CONFIG_IPV6_ROUTER_PREF=y
105104
CONFIG_IPV6_ROUTE_INFO=y
106105
CONFIG_INET6_AH=m
@@ -109,6 +108,7 @@ CONFIG_INET6_ESP_OFFLOAD=m
109108
CONFIG_INET6_IPCOMP=m
110109
CONFIG_IPV6_ILA=m
111110
CONFIG_IPV6_VTI=m
111+
CONFIG_IPV6_SIT=m
112112
CONFIG_IPV6_SIT_6RD=y
113113
CONFIG_IPV6_GRE=m
114114
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -376,16 +376,6 @@ CONFIG_BATMAN_ADV=m
376376
CONFIG_OPENVSWITCH=m
377377
CONFIG_CGROUP_NET_PRIO=y
378378
CONFIG_NET_PKTGEN=m
379-
CONFIG_HAMRADIO=y
380-
CONFIG_AX25=m
381-
CONFIG_NETROM=m
382-
CONFIG_ROSE=m
383-
CONFIG_MKISS=m
384-
CONFIG_6PACK=m
385-
CONFIG_BPQETHER=m
386-
CONFIG_BAYCOM_SER_FDX=m
387-
CONFIG_BAYCOM_SER_HDX=m
388-
CONFIG_YAM=m
389379
CONFIG_CAN=m
390380
CONFIG_CAN_J1939=m
391381
CONFIG_CAN_ISOTP=m
@@ -697,6 +687,7 @@ CONFIG_PPS_CLIENT_LDISC=m
697687
CONFIG_PPS_CLIENT_GPIO=m
698688
CONFIG_PINCTRL_MCP23S08=m
699689
CONFIG_GPIO_SYSFS=y
690+
CONFIG_GPIO_CDEV_V1=y
700691
CONFIG_GPIO_BCM_VIRT=y
701692
CONFIG_GPIO_FXL6408=m
702693
CONFIG_GPIO_MAX7300=m
@@ -976,7 +967,6 @@ CONFIG_DRM_DISPLAY_CONNECTOR=m
976967
CONFIG_DRM_SIMPLE_BRIDGE=m
977968
CONFIG_DRM_TOSHIBA_TC358762=m
978969
CONFIG_DRM_GUD=m
979-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
980970
CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI=m
981971
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
982972
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -1595,12 +1585,15 @@ CONFIG_CRYPTO_ADIANTUM=m
15951585
CONFIG_CRYPTO_CHACHA20POLY1305=m
15961586
CONFIG_CRYPTO_BLAKE2B=m
15971587
CONFIG_CRYPTO_MD4=m
1588+
CONFIG_CRYPTO_MD5=m
1589+
CONFIG_CRYPTO_SHA3=m
15981590
CONFIG_CRYPTO_WP512=m
15991591
CONFIG_CRYPTO_XCBC=m
16001592
CONFIG_CRYPTO_XXHASH=m
16011593
CONFIG_CRYPTO_CRC32C=m
16021594
CONFIG_CRYPTO_LZ4=m
16031595
CONFIG_CRYPTO_LZ4HC=m
1596+
CONFIG_CRYPTO_JITTERENTROPY=m
16041597
CONFIG_CRYPTO_USER_API_HASH=m
16051598
CONFIG_CRYPTO_USER_API_SKCIPHER=m
16061599
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ CONFIG_INET_IPCOMP=m
9494
CONFIG_INET_DIAG=m
9595
CONFIG_TCP_CONG_ADVANCED=y
9696
CONFIG_TCP_CONG_BBR=m
97-
CONFIG_IPV6=y
9897
CONFIG_IPV6_ROUTER_PREF=y
9998
CONFIG_IPV6_ROUTE_INFO=y
10099
CONFIG_INET6_AH=m
@@ -103,6 +102,7 @@ CONFIG_INET6_ESP_OFFLOAD=m
103102
CONFIG_INET6_IPCOMP=m
104103
CONFIG_IPV6_ILA=m
105104
CONFIG_IPV6_VTI=m
105+
CONFIG_IPV6_SIT=m
106106
CONFIG_IPV6_SIT_6RD=y
107107
CONFIG_IPV6_GRE=m
108108
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -370,16 +370,6 @@ CONFIG_BATMAN_ADV=m
370370
CONFIG_OPENVSWITCH=m
371371
CONFIG_CGROUP_NET_PRIO=y
372372
CONFIG_NET_PKTGEN=m
373-
CONFIG_HAMRADIO=y
374-
CONFIG_AX25=m
375-
CONFIG_NETROM=m
376-
CONFIG_ROSE=m
377-
CONFIG_MKISS=m
378-
CONFIG_6PACK=m
379-
CONFIG_BPQETHER=m
380-
CONFIG_BAYCOM_SER_FDX=m
381-
CONFIG_BAYCOM_SER_HDX=m
382-
CONFIG_YAM=m
383373
CONFIG_CAN=m
384374
CONFIG_CAN_J1939=m
385375
CONFIG_CAN_ISOTP=m
@@ -691,6 +681,7 @@ CONFIG_PPS_CLIENT_LDISC=m
691681
CONFIG_PPS_CLIENT_GPIO=m
692682
CONFIG_PINCTRL_MCP23S08=m
693683
CONFIG_GPIO_SYSFS=y
684+
CONFIG_GPIO_CDEV_V1=y
694685
CONFIG_GPIO_FXL6408=m
695686
CONFIG_GPIO_MAX7300=m
696687
CONFIG_GPIO_PCA953X=m
@@ -969,7 +960,6 @@ CONFIG_DRM_DISPLAY_CONNECTOR=m
969960
CONFIG_DRM_SIMPLE_BRIDGE=m
970961
CONFIG_DRM_TOSHIBA_TC358762=m
971962
CONFIG_DRM_GUD=m
972-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
973963
CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI=m
974964
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
975965
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -1588,12 +1578,15 @@ CONFIG_CRYPTO_XTS=m
15881578
CONFIG_CRYPTO_CHACHA20POLY1305=m
15891579
CONFIG_CRYPTO_BLAKE2B=m
15901580
CONFIG_CRYPTO_MD4=m
1581+
CONFIG_CRYPTO_MD5=m
1582+
CONFIG_CRYPTO_SHA3=m
15911583
CONFIG_CRYPTO_WP512=m
15921584
CONFIG_CRYPTO_XCBC=m
15931585
CONFIG_CRYPTO_XXHASH=m
15941586
CONFIG_CRYPTO_CRC32C=m
15951587
CONFIG_CRYPTO_LZ4=m
15961588
CONFIG_CRYPTO_LZ4HC=m
1589+
CONFIG_CRYPTO_JITTERENTROPY=m
15971590
CONFIG_CRYPTO_USER_API_HASH=m
15981591
CONFIG_CRYPTO_USER_API_SKCIPHER=m
15991592
CONFIG_CRYPTO_USER_API_RNG=m

‎arch/arm64/configs/bcm2711_defconfig‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ CONFIG_INET_IPCOMP=m
120120
CONFIG_INET_DIAG=m
121121
CONFIG_TCP_CONG_ADVANCED=y
122122
CONFIG_TCP_CONG_BBR=m
123-
CONFIG_IPV6=y
124123
CONFIG_IPV6_ROUTER_PREF=y
125124
CONFIG_IPV6_ROUTE_INFO=y
126125
CONFIG_INET6_AH=m
@@ -129,6 +128,7 @@ CONFIG_INET6_ESP_OFFLOAD=m
129128
CONFIG_INET6_IPCOMP=m
130129
CONFIG_IPV6_ILA=m
131130
CONFIG_IPV6_VTI=m
131+
CONFIG_IPV6_SIT=m
132132
CONFIG_IPV6_SIT_6RD=y
133133
CONFIG_IPV6_GRE=m
134134
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -402,16 +402,6 @@ CONFIG_OPENVSWITCH=m
402402
CONFIG_VSOCKETS=m
403403
CONFIG_CGROUP_NET_PRIO=y
404404
CONFIG_NET_PKTGEN=m
405-
CONFIG_HAMRADIO=y
406-
CONFIG_AX25=m
407-
CONFIG_NETROM=m
408-
CONFIG_ROSE=m
409-
CONFIG_MKISS=m
410-
CONFIG_6PACK=m
411-
CONFIG_BPQETHER=m
412-
CONFIG_BAYCOM_SER_FDX=m
413-
CONFIG_BAYCOM_SER_HDX=m
414-
CONFIG_YAM=m
415405
CONFIG_CAN=m
416406
CONFIG_CAN_J1939=m
417407
CONFIG_CAN_ISOTP=m
@@ -779,6 +769,7 @@ CONFIG_PINCTRL_RP1=y
779769
CONFIG_PINCTRL_BRCMSTB=y
780770
CONFIG_PINCTRL_BCM2712=y
781771
CONFIG_GPIO_SYSFS=y
772+
CONFIG_GPIO_CDEV_V1=y
782773
CONFIG_GPIO_BCM_VIRT=y
783774
CONFIG_GPIO_FXL6408=m
784775
CONFIG_GPIO_MAX7300=m
@@ -1076,7 +1067,6 @@ CONFIG_DRM_TI_SN65DSI83=m
10761067
CONFIG_DRM_GUD=m
10771068
CONFIG_DRM_PANEL_LVDS=m
10781069
CONFIG_DRM_PANEL_ILITEK_IL79600A=m
1079-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
10801070
CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI=m
10811071
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
10821072
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -1724,18 +1714,20 @@ CONFIG_CRYPTO_ADIANTUM=m
17241714
CONFIG_CRYPTO_CHACHA20POLY1305=m
17251715
CONFIG_CRYPTO_BLAKE2B=m
17261716
CONFIG_CRYPTO_MD4=m
1717+
CONFIG_CRYPTO_MD5=m
1718+
CONFIG_CRYPTO_SHA3=m
17271719
CONFIG_CRYPTO_WP512=m
17281720
CONFIG_CRYPTO_XCBC=m
17291721
CONFIG_CRYPTO_XXHASH=m
17301722
CONFIG_CRYPTO_CRC32C=m
17311723
CONFIG_CRYPTO_LZ4=m
17321724
CONFIG_CRYPTO_LZ4HC=m
1725+
CONFIG_CRYPTO_JITTERENTROPY=m
17331726
CONFIG_CRYPTO_USER_API_HASH=m
17341727
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17351728
CONFIG_CRYPTO_USER_API_RNG=m
17361729
CONFIG_CRYPTO_USER_API_AEAD=m
17371730
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1738-
CONFIG_CRYPTO_SM3_ARM64_CE=m
17391731
CONFIG_CRYPTO_AES_ARM64_BS=m
17401732
CONFIG_CRYPTO_SM4_ARM64_CE=m
17411733
CONFIG_CRYPTO_AES_ARM64_CE_CCM=m

‎arch/arm64/configs/bcm2711_rt_defconfig‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ CONFIG_INET_IPCOMP=m
120120
CONFIG_INET_DIAG=m
121121
CONFIG_TCP_CONG_ADVANCED=y
122122
CONFIG_TCP_CONG_BBR=m
123-
CONFIG_IPV6=y
124123
CONFIG_IPV6_ROUTER_PREF=y
125124
CONFIG_IPV6_ROUTE_INFO=y
126125
CONFIG_INET6_AH=m
@@ -129,6 +128,7 @@ CONFIG_INET6_ESP_OFFLOAD=m
129128
CONFIG_INET6_IPCOMP=m
130129
CONFIG_IPV6_ILA=m
131130
CONFIG_IPV6_VTI=m
131+
CONFIG_IPV6_SIT=m
132132
CONFIG_IPV6_SIT_6RD=y
133133
CONFIG_IPV6_GRE=m
134134
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -402,16 +402,6 @@ CONFIG_OPENVSWITCH=m
402402
CONFIG_VSOCKETS=m
403403
CONFIG_CGROUP_NET_PRIO=y
404404
CONFIG_NET_PKTGEN=m
405-
CONFIG_HAMRADIO=y
406-
CONFIG_AX25=m
407-
CONFIG_NETROM=m
408-
CONFIG_ROSE=m
409-
CONFIG_MKISS=m
410-
CONFIG_6PACK=m
411-
CONFIG_BPQETHER=m
412-
CONFIG_BAYCOM_SER_FDX=m
413-
CONFIG_BAYCOM_SER_HDX=m
414-
CONFIG_YAM=m
415405
CONFIG_CAN=m
416406
CONFIG_CAN_J1939=m
417407
CONFIG_CAN_ISOTP=m
@@ -778,6 +768,7 @@ CONFIG_PINCTRL_RP1=y
778768
CONFIG_PINCTRL_BRCMSTB=y
779769
CONFIG_PINCTRL_BCM2712=y
780770
CONFIG_GPIO_SYSFS=y
771+
CONFIG_GPIO_CDEV_V1=y
781772
CONFIG_GPIO_BCM_VIRT=y
782773
CONFIG_GPIO_FXL6408=m
783774
CONFIG_GPIO_MAX7300=m
@@ -1073,7 +1064,6 @@ CONFIG_DRM_TOSHIBA_TC358762=m
10731064
CONFIG_DRM_TI_SN65DSI83=m
10741065
CONFIG_DRM_GUD=m
10751066
CONFIG_DRM_PANEL_LVDS=m
1076-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
10771067
CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI=m
10781068
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
10791069
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -1720,18 +1710,20 @@ CONFIG_CRYPTO_ADIANTUM=m
17201710
CONFIG_CRYPTO_CHACHA20POLY1305=m
17211711
CONFIG_CRYPTO_BLAKE2B=m
17221712
CONFIG_CRYPTO_MD4=m
1713+
CONFIG_CRYPTO_MD5=m
1714+
CONFIG_CRYPTO_SHA3=m
17231715
CONFIG_CRYPTO_WP512=m
17241716
CONFIG_CRYPTO_XCBC=m
17251717
CONFIG_CRYPTO_XXHASH=m
17261718
CONFIG_CRYPTO_CRC32C=m
17271719
CONFIG_CRYPTO_LZ4=m
17281720
CONFIG_CRYPTO_LZ4HC=m
1721+
CONFIG_CRYPTO_JITTERENTROPY=m
17291722
CONFIG_CRYPTO_USER_API_HASH=m
17301723
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17311724
CONFIG_CRYPTO_USER_API_RNG=m
17321725
CONFIG_CRYPTO_USER_API_AEAD=m
17331726
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1734-
CONFIG_CRYPTO_SM3_ARM64_CE=m
17351727
CONFIG_CRYPTO_AES_ARM64_BS=m
17361728
CONFIG_CRYPTO_SM4_ARM64_CE=m
17371729
CONFIG_CRYPTO_AES_ARM64_CE_CCM=m

‎arch/arm64/configs/bcm2712_defconfig‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ CONFIG_INET_IPCOMP=m
123123
CONFIG_INET_DIAG=m
124124
CONFIG_TCP_CONG_ADVANCED=y
125125
CONFIG_TCP_CONG_BBR=m
126-
CONFIG_IPV6=y
127126
CONFIG_IPV6_ROUTER_PREF=y
128127
CONFIG_IPV6_ROUTE_INFO=y
129128
CONFIG_INET6_AH=m
@@ -132,6 +131,7 @@ CONFIG_INET6_ESP_OFFLOAD=m
132131
CONFIG_INET6_IPCOMP=m
133132
CONFIG_IPV6_ILA=m
134133
CONFIG_IPV6_VTI=m
134+
CONFIG_IPV6_SIT=m
135135
CONFIG_IPV6_SIT_6RD=y
136136
CONFIG_IPV6_GRE=m
137137
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -405,16 +405,6 @@ CONFIG_OPENVSWITCH=m
405405
CONFIG_VSOCKETS=m
406406
CONFIG_CGROUP_NET_PRIO=y
407407
CONFIG_NET_PKTGEN=m
408-
CONFIG_HAMRADIO=y
409-
CONFIG_AX25=m
410-
CONFIG_NETROM=m
411-
CONFIG_ROSE=m
412-
CONFIG_MKISS=m
413-
CONFIG_6PACK=m
414-
CONFIG_BPQETHER=m
415-
CONFIG_BAYCOM_SER_FDX=m
416-
CONFIG_BAYCOM_SER_HDX=m
417-
CONFIG_YAM=m
418408
CONFIG_CAN=m
419409
CONFIG_CAN_J1939=m
420410
CONFIG_CAN_ISOTP=m
@@ -781,6 +771,7 @@ CONFIG_PINCTRL_RP1=y
781771
CONFIG_PINCTRL_BRCMSTB=y
782772
CONFIG_PINCTRL_BCM2712=y
783773
CONFIG_GPIO_SYSFS=y
774+
CONFIG_GPIO_CDEV_V1=y
784775
CONFIG_GPIO_BCM_VIRT=y
785776
CONFIG_GPIO_FXL6408=m
786777
CONFIG_GPIO_MAX7300=m
@@ -1078,7 +1069,6 @@ CONFIG_DRM_TI_SN65DSI83=m
10781069
CONFIG_DRM_GUD=m
10791070
CONFIG_DRM_PANEL_LVDS=m
10801071
CONFIG_DRM_PANEL_ILITEK_IL79600A=m
1081-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
10821072
CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI=m
10831073
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
10841074
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -1726,18 +1716,20 @@ CONFIG_CRYPTO_ADIANTUM=m
17261716
CONFIG_CRYPTO_CHACHA20POLY1305=m
17271717
CONFIG_CRYPTO_BLAKE2B=m
17281718
CONFIG_CRYPTO_MD4=m
1719+
CONFIG_CRYPTO_MD5=m
1720+
CONFIG_CRYPTO_SHA3=m
17291721
CONFIG_CRYPTO_WP512=m
17301722
CONFIG_CRYPTO_XCBC=m
17311723
CONFIG_CRYPTO_XXHASH=m
17321724
CONFIG_CRYPTO_CRC32C=m
17331725
CONFIG_CRYPTO_LZ4=m
17341726
CONFIG_CRYPTO_LZ4HC=m
1727+
CONFIG_CRYPTO_JITTERENTROPY=m
17351728
CONFIG_CRYPTO_USER_API_HASH=m
17361729
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17371730
CONFIG_CRYPTO_USER_API_RNG=m
17381731
CONFIG_CRYPTO_USER_API_AEAD=m
17391732
CONFIG_CRYPTO_GHASH_ARM64_CE=m
1740-
CONFIG_CRYPTO_SM3_ARM64_CE=m
17411733
CONFIG_CRYPTO_AES_ARM64_BS=m
17421734
CONFIG_CRYPTO_SM4_ARM64_CE=m
17431735
CONFIG_CRYPTO_AES_ARM64_CE_CCM=m

0 commit comments

Comments
 (0)