Skip to content

Commit 84aff0b

Browse files
bulwahntsbogend
authored andcommitted
mips: update config files
Clean up config files by: - removing configs that were deleted in the past - removing configs not in tree and without recently pending patches - adding new configs that are replacements for old configs in the file For some detailed information, see Link. Link: https://lore.kernel.org/kernel-janitors/20220929090645.1389-1-lukas.bulwahn@gmail.com/ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent bf21f3f commit 84aff0b

43 files changed

Lines changed: 2 additions & 236 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/mips/configs/ar7_defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y
3232
CONFIG_IP_ROUTE_VERBOSE=y
3333
CONFIG_IP_MROUTE=y
3434
CONFIG_SYN_COOKIES=y
35-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
36-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
37-
# CONFIG_INET_XFRM_MODE_BEET is not set
3835
# CONFIG_INET_DIAG is not set
3936
CONFIG_TCP_CONG_ADVANCED=y
4037
# CONFIG_TCP_CONG_BIC is not set
@@ -117,7 +114,6 @@ CONFIG_JFFS2_SUMMARY=y
117114
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
118115
CONFIG_SQUASHFS=y
119116
# CONFIG_CRYPTO_HW is not set
120-
# CONFIG_ENABLE_MUST_CHECK is not set
121117
CONFIG_STRIP_ASM_SYMS=y
122118
CONFIG_DEBUG_FS=y
123119
CONFIG_CMDLINE_BOOL=y

arch/mips/configs/ath25_defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ CONFIG_UNIX=y
2929
CONFIG_INET=y
3030
CONFIG_IP_MULTICAST=y
3131
CONFIG_IP_ADVANCED_ROUTER=y
32-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
33-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
34-
# CONFIG_INET_XFRM_MODE_BEET is not set
3532
# CONFIG_IPV6 is not set
3633
CONFIG_CFG80211=m
3734
CONFIG_MAC80211=m
@@ -108,7 +105,6 @@ CONFIG_SQUASHFS_XZ=y
108105
# CONFIG_XZ_DEC_ARMTHUMB is not set
109106
# CONFIG_XZ_DEC_SPARC is not set
110107
CONFIG_PRINTK_TIME=y
111-
# CONFIG_ENABLE_MUST_CHECK is not set
112108
CONFIG_STRIP_ASM_SYMS=y
113109
CONFIG_DEBUG_FS=y
114110
# CONFIG_SCHED_DEBUG is not set

arch/mips/configs/ath79_defconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ CONFIG_EMBEDDED=y
1010
# CONFIG_SLUB_DEBUG is not set
1111
# CONFIG_COMPAT_BRK is not set
1212
CONFIG_ATH79=y
13-
CONFIG_ATH79_MACH_AP121=y
14-
CONFIG_ATH79_MACH_AP136=y
15-
CONFIG_ATH79_MACH_AP81=y
16-
CONFIG_ATH79_MACH_DB120=y
17-
CONFIG_ATH79_MACH_PB44=y
18-
CONFIG_ATH79_MACH_UBNT_XM=y
1913
CONFIG_HZ_100=y
2014
# CONFIG_SECCOMP is not set
2115
CONFIG_PCI=y
@@ -29,9 +23,6 @@ CONFIG_UNIX=y
2923
CONFIG_INET=y
3024
CONFIG_IP_MULTICAST=y
3125
CONFIG_IP_ADVANCED_ROUTER=y
32-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
33-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
34-
# CONFIG_INET_XFRM_MODE_BEET is not set
3526
# CONFIG_IPV6 is not set
3627
CONFIG_CFG80211=m
3728
CONFIG_MAC80211=m
@@ -92,7 +83,6 @@ CONFIG_LEDS_GPIO=y
9283
# CONFIG_DNOTIFY is not set
9384
# CONFIG_PROC_PAGE_MONITOR is not set
9485
CONFIG_CRC_ITU_T=m
95-
# CONFIG_ENABLE_MUST_CHECK is not set
9686
CONFIG_STRIP_ASM_SYMS=y
9787
CONFIG_DEBUG_FS=y
9888
# CONFIG_SCHED_DEBUG is not set

arch/mips/configs/bcm63xx_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ CONFIG_PCMCIA_BCM63XX=y
2424
CONFIG_NET=y
2525
CONFIG_UNIX=y
2626
CONFIG_INET=y
27-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
28-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
29-
# CONFIG_INET_XFRM_MODE_BEET is not set
3027
# CONFIG_INET_DIAG is not set
3128
# CONFIG_IPV6 is not set
3229
CONFIG_CFG80211=y

arch/mips/configs/bigsur_defconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ CONFIG_IP_PIMSM_V2=y
4949
CONFIG_INET_AH=m
5050
CONFIG_INET_ESP=m
5151
CONFIG_INET_IPCOMP=m
52-
CONFIG_INET_XFRM_MODE_TRANSPORT=m
53-
CONFIG_INET_XFRM_MODE_TUNNEL=m
5452
CONFIG_TCP_MD5SIG=y
5553
CONFIG_IPV6_ROUTER_PREF=y
5654
CONFIG_IPV6_ROUTE_INFO=y
@@ -59,7 +57,6 @@ CONFIG_INET6_AH=m
5957
CONFIG_INET6_ESP=m
6058
CONFIG_INET6_IPCOMP=m
6159
CONFIG_IPV6_MIP6=m
62-
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
6360
CONFIG_IPV6_SIT_6RD=y
6461
CONFIG_IPV6_TUNNEL=m
6562
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -101,7 +98,6 @@ CONFIG_BAYCOM_SER_HDX=m
10198
CONFIG_YAM=m
10299
CONFIG_FW_LOADER=m
103100
CONFIG_BLK_DEV_LOOP=m
104-
CONFIG_BLK_DEV_CRYPTOLOOP=m
105101
CONFIG_BLK_DEV_NBD=m
106102
CONFIG_EEPROM_LEGACY=y
107103
CONFIG_EEPROM_MAX6875=y
@@ -230,20 +226,15 @@ CONFIG_CRYPTO_XCBC=m
230226
CONFIG_CRYPTO_VMAC=m
231227
CONFIG_CRYPTO_MD4=m
232228
CONFIG_CRYPTO_MICHAEL_MIC=m
233-
CONFIG_CRYPTO_RMD128=m
234229
CONFIG_CRYPTO_RMD160=m
235-
CONFIG_CRYPTO_RMD256=m
236-
CONFIG_CRYPTO_RMD320=m
237230
CONFIG_CRYPTO_SHA512=m
238-
CONFIG_CRYPTO_TGR192=m
239231
CONFIG_CRYPTO_WP512=m
240232
CONFIG_CRYPTO_ANUBIS=m
241233
CONFIG_CRYPTO_BLOWFISH=m
242234
CONFIG_CRYPTO_CAMELLIA=m
243235
CONFIG_CRYPTO_CAST6=m
244236
CONFIG_CRYPTO_FCRYPT=m
245237
CONFIG_CRYPTO_KHAZAD=m
246-
CONFIG_CRYPTO_SALSA20=m
247238
CONFIG_CRYPTO_SEED=m
248239
CONFIG_CRYPTO_SERPENT=m
249240
CONFIG_CRYPTO_TEA=m

arch/mips/configs/bmips_be_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ CONFIG_PACKET=y
1717
CONFIG_PACKET_DIAG=y
1818
CONFIG_UNIX=y
1919
CONFIG_INET=y
20-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
21-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
22-
# CONFIG_INET_XFRM_MODE_BEET is not set
2320
# CONFIG_INET_DIAG is not set
2421
CONFIG_CFG80211=y
2522
CONFIG_NL80211_TESTMODE=y

arch/mips/configs/bmips_stb_defconfig

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_HIGHMEM=y
1212
CONFIG_HIGH_RES_TIMERS=y
1313
CONFIG_SMP=y
1414
CONFIG_NR_CPUS=4
15-
CONFIG_CC_STACKPROTECTOR_STRONG=y
1615
# CONFIG_SECCOMP is not set
1716
CONFIG_MIPS_O32_FP64_SUPPORT=y
1817
# CONFIG_RD_GZIP is not set
@@ -21,16 +20,13 @@ CONFIG_MIPS_O32_FP64_SUPPORT=y
2120
CONFIG_RD_XZ=y
2221
# CONFIG_RD_LZO is not set
2322
# CONFIG_RD_LZ4 is not set
24-
# CONFIG_IOSCHED_DEADLINE is not set
25-
# CONFIG_IOSCHED_CFQ is not set
2623
CONFIG_PCI=y
2724
CONFIG_PCI_MSI=y
2825
CONFIG_PCIEASPM_POWERSAVE=y
2926
CONFIG_PCIEPORTBUS=y
3027
CONFIG_PCIE_BRCMSTB=y
3128
CONFIG_CPU_FREQ=y
3229
CONFIG_CPU_FREQ_STAT=y
33-
CONFIG_CPU_FREQ_STAT_DETAILS=y
3430
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
3531
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
3632
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -44,15 +40,11 @@ CONFIG_PACKET=y
4440
CONFIG_PACKET_DIAG=y
4541
CONFIG_UNIX=y
4642
CONFIG_INET=y
47-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
48-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
49-
# CONFIG_INET_XFRM_MODE_BEET is not set
5043
# CONFIG_INET_DIAG is not set
5144
CONFIG_CFG80211=y
5245
CONFIG_NL80211_TESTMODE=y
5346
CONFIG_WIRELESS=y
5447
CONFIG_MAC80211=y
55-
CONFIG_NL80211=y
5648
CONFIG_DEVTMPFS=y
5749
CONFIG_DEVTMPFS_MOUNT=y
5850
# CONFIG_STANDALONE is not set
@@ -70,10 +62,6 @@ CONFIG_IP_PNP_RARP=y
7062
CONFIG_IP_MROUTE=y
7163
CONFIG_IP_PIMSM_V1=y
7264
CONFIG_IP_PIMSM_V2=y
73-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
74-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
75-
# CONFIG_INET_XFRM_MODE_BEET is not set
76-
# CONFIG_INET_LRO is not set
7765
CONFIG_INET_UDP_DIAG=y
7866
CONFIG_TCP_CONG_ADVANCED=y
7967
CONFIG_TCP_CONG_BIC=y
@@ -93,7 +81,6 @@ CONFIG_NET_SWITCHDEV=y
9381
CONFIG_DMA_CMA=y
9482
CONFIG_CMA_ALIGNMENT=12
9583
CONFIG_SPI=y
96-
CONFIG_SPI_BRCMSTB=y
9784
CONFIG_MTD=y
9885
CONFIG_MTD_CMDLINE_PARTS=y
9986
CONFIG_MTD_BLOCK=y
@@ -105,22 +92,18 @@ CONFIG_MTD_CFI_STAA=y
10592
CONFIG_MTD_ROM=y
10693
CONFIG_MTD_ABSENT=y
10794
CONFIG_MTD_PHYSMAP_OF=y
108-
CONFIG_MTD_M25P80=y
109-
CONFIG_MTD_NAND=y
11095
CONFIG_MTD_NAND_BRCMNAND=y
11196
CONFIG_MTD_SPI_NOR=y
11297
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
11398
CONFIG_MTD_UBI=y
11499
CONFIG_MTD_UBI_GLUEBI=y
115-
CONFIG_PROC_DEVICETREE=y
116100
CONFIG_BLK_DEV_LOOP=y
117101
CONFIG_BLK_DEV_RAM=y
118102
CONFIG_BLK_DEV_RAM_SIZE=8192
119103
# CONFIG_BLK_DEV is not set
120104
CONFIG_SCSI=y
121105
CONFIG_BLK_DEV_SD=y
122106
CONFIG_CHR_DEV_SG=y
123-
CONFIG_SCSI_MULTI_LUN=y
124107
# CONFIG_SCSI_LOWLEVEL is not set
125108
CONFIG_NETDEVICES=y
126109
CONFIG_VLAN_8021Q=y
@@ -135,7 +118,6 @@ CONFIG_INPUT_UINPUT=y
135118
# CONFIG_SERIO is not set
136119
CONFIG_VT=y
137120
CONFIG_VT_HW_CONSOLE_BINDING=y
138-
# CONFIG_DEVKMEM is not set
139121
CONFIG_SERIAL_8250=y
140122
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
141123
CONFIG_SERIAL_8250_CONSOLE=y
@@ -203,17 +185,14 @@ CONFIG_CMDLINE="earlycon"
203185
CONFIG_MIPS_CMDLINE_DTB_EXTEND=y
204186
# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
205187
# CONFIG_CRYPTO_HW is not set
206-
CONFIG_DT_BCM974XX=y
207188
CONFIG_FW_CFE=y
208189
CONFIG_ATA=y
209190
CONFIG_SATA_AHCI_PLATFORM=y
210-
CONFIG_AHCI_BRCMSTB=y
211191
CONFIG_GENERIC_PHY=y
212192
CONFIG_GPIOLIB=y
213193
CONFIG_GPIO_SYSFS=y
214194
CONFIG_PHY_BRCM_USB=y
215195
CONFIG_PHY_BRCM_SATA=y
216-
CONFIG_PM_RUNTIME=y
217196
CONFIG_PM_DEBUG=y
218197
CONFIG_SYSVIPC=y
219198
CONFIG_FUNCTION_GRAPH_TRACER=y
@@ -227,3 +206,5 @@ CONFIG_FTRACE_SYSCALLS=y
227206
CONFIG_TRACER_SNAPSHOT=y
228207
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
229208
CONFIG_STACK_TRACER=y
209+
CONFIG_AHCI_BRCM=y
210+
CONFIG_MTD_RAW_NAND=y

arch/mips/configs/cavium_octeon_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ CONFIG_NETDEVICES=y
7171
# CONFIG_NET_VENDOR_DEC is not set
7272
# CONFIG_NET_VENDOR_DLINK is not set
7373
# CONFIG_NET_VENDOR_EMULEX is not set
74-
# CONFIG_NET_VENDOR_HP is not set
7574
# CONFIG_NET_VENDOR_INTEL is not set
7675
# CONFIG_NET_VENDOR_MARVELL is not set
7776
# CONFIG_NET_VENDOR_MELLANOX is not set

arch/mips/configs/db1xxx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ CONFIG_INET6_AH=y
6161
CONFIG_INET6_ESP=y
6262
CONFIG_INET6_IPCOMP=y
6363
CONFIG_IPV6_MIP6=y
64-
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y
6564
CONFIG_IPV6_VTI=y
6665
CONFIG_IPV6_SIT_6RD=y
6766
CONFIG_IPV6_GRE=y

arch/mips/configs/decstation_64_defconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,13 @@ CONFIG_SYN_COOKIES=y
3737
CONFIG_INET_AH=m
3838
CONFIG_INET_ESP=m
3939
CONFIG_INET_IPCOMP=m
40-
CONFIG_INET_XFRM_MODE_TRANSPORT=m
41-
CONFIG_INET_XFRM_MODE_TUNNEL=m
42-
CONFIG_INET_XFRM_MODE_BEET=m
4340
CONFIG_TCP_MD5SIG=y
4441
CONFIG_IPV6_ROUTER_PREF=y
4542
CONFIG_IPV6_ROUTE_INFO=y
4643
CONFIG_INET6_AH=m
4744
CONFIG_INET6_ESP=m
4845
CONFIG_INET6_IPCOMP=m
4946
CONFIG_IPV6_MIP6=m
50-
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
5147
CONFIG_IPV6_MULTIPLE_TABLES=y
5248
CONFIG_IPV6_SUBTREES=y
5349
CONFIG_NETWORK_SECMARK=y
@@ -79,7 +75,6 @@ CONFIG_NETDEVICES=y
7975
CONFIG_DECLANCE=y
8076
# CONFIG_NET_VENDOR_AQUANTIA is not set
8177
# CONFIG_NET_VENDOR_ARC is not set
82-
# CONFIG_NET_VENDOR_AURORA is not set
8378
# CONFIG_NET_VENDOR_BROADCOM is not set
8479
# CONFIG_NET_VENDOR_CADENCE is not set
8580
# CONFIG_NET_VENDOR_CAVIUM is not set
@@ -193,12 +188,8 @@ CONFIG_CRYPTO_CRC32=m
193188
CONFIG_CRYPTO_CRCT10DIF=m
194189
CONFIG_CRYPTO_MD4=m
195190
CONFIG_CRYPTO_MICHAEL_MIC=m
196-
CONFIG_CRYPTO_RMD128=m
197191
CONFIG_CRYPTO_RMD160=m
198-
CONFIG_CRYPTO_RMD256=m
199-
CONFIG_CRYPTO_RMD320=m
200192
CONFIG_CRYPTO_SHA512=m
201-
CONFIG_CRYPTO_TGR192=m
202193
CONFIG_CRYPTO_WP512=m
203194
CONFIG_CRYPTO_ANUBIS=m
204195
CONFIG_CRYPTO_ARC4=m
@@ -208,7 +199,6 @@ CONFIG_CRYPTO_CAST5=m
208199
CONFIG_CRYPTO_CAST6=m
209200
CONFIG_CRYPTO_FCRYPT=m
210201
CONFIG_CRYPTO_KHAZAD=m
211-
CONFIG_CRYPTO_SALSA20=m
212202
CONFIG_CRYPTO_SEED=m
213203
CONFIG_CRYPTO_SERPENT=m
214204
CONFIG_CRYPTO_TEA=m

0 commit comments

Comments
 (0)