Skip to content

Commit bcecb96

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
configs: Rebuild bcmrpi3_defconfig to fix warnings
Also disable CONFIG_MMC_BCM2835 to avoid a runtime conflict. Signed-off-by: Phil Elwell <[email protected]>
1 parent 25c25e2 commit bcecb96

File tree

1 file changed

+37
-111
lines changed

1 file changed

+37
-111
lines changed

arch/arm64/configs/bcmrpi3_defconfig

Lines changed: 37 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y
44
CONFIG_POSIX_MQUEUE=y
55
CONFIG_NO_HZ=y
66
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_PREEMPT=y
78
CONFIG_BSD_PROCESS_ACCT=y
89
CONFIG_BSD_PROCESS_ACCT_V3=y
910
CONFIG_TASKSTATS=y
@@ -25,37 +26,20 @@ CONFIG_BLK_DEV_INITRD=y
2526
CONFIG_EMBEDDED=y
2627
# CONFIG_COMPAT_BRK is not set
2728
CONFIG_PROFILING=y
28-
CONFIG_KPROBES=y
29-
CONFIG_JUMP_LABEL=y
30-
CONFIG_MODULES=y
31-
CONFIG_MODULE_UNLOAD=y
32-
CONFIG_MODVERSIONS=y
33-
CONFIG_MODULE_SRCVERSION_ALL=y
34-
CONFIG_BLK_DEV_THROTTLING=y
35-
CONFIG_PARTITION_ADVANCED=y
36-
CONFIG_MAC_PARTITION=y
37-
CONFIG_CFQ_GROUP_IOSCHED=y
3829
CONFIG_ARCH_BCM2835=y
3930
# CONFIG_CAVIUM_ERRATUM_22375 is not set
4031
# CONFIG_CAVIUM_ERRATUM_23154 is not set
4132
# CONFIG_CAVIUM_ERRATUM_27456 is not set
4233
CONFIG_SCHED_MC=y
4334
CONFIG_NR_CPUS=4
44-
CONFIG_PREEMPT=y
4535
CONFIG_HZ_1000=y
46-
CONFIG_CLEANCACHE=y
47-
CONFIG_FRONTSWAP=y
48-
CONFIG_CMA=y
49-
CONFIG_ZSMALLOC=m
50-
CONFIG_PGTABLE_MAPPING=y
5136
CONFIG_SECCOMP=y
5237
CONFIG_ARMV8_DEPRECATED=y
5338
CONFIG_SWP_EMULATION=y
5439
CONFIG_CP15_BARRIER_EMULATION=y
5540
CONFIG_SETEND_EMULATION=y
5641
CONFIG_RANDOMIZE_BASE=y
5742
CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
58-
CONFIG_BINFMT_MISC=y
5943
CONFIG_COMPAT=y
6044
# CONFIG_SUSPEND is not set
6145
CONFIG_PM=y
@@ -69,6 +53,25 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
6953
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
7054
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
7155
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
56+
CONFIG_RASPBERRYPI_FIRMWARE=y
57+
CONFIG_ARM64_CRYPTO=y
58+
CONFIG_CRYPTO_AES_ARM64_BS=m
59+
CONFIG_KPROBES=y
60+
CONFIG_JUMP_LABEL=y
61+
CONFIG_MODULES=y
62+
CONFIG_MODULE_UNLOAD=y
63+
CONFIG_MODVERSIONS=y
64+
CONFIG_MODULE_SRCVERSION_ALL=y
65+
CONFIG_BLK_DEV_THROTTLING=y
66+
CONFIG_PARTITION_ADVANCED=y
67+
CONFIG_MAC_PARTITION=y
68+
CONFIG_CFQ_GROUP_IOSCHED=y
69+
CONFIG_BINFMT_MISC=y
70+
CONFIG_CLEANCACHE=y
71+
CONFIG_FRONTSWAP=y
72+
CONFIG_CMA=y
73+
CONFIG_ZSMALLOC=m
74+
CONFIG_PGTABLE_MAPPING=y
7275
CONFIG_NET=y
7376
CONFIG_PACKET=y
7477
CONFIG_UNIX=y
@@ -98,6 +101,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
98101
CONFIG_INET_XFRM_MODE_TUNNEL=m
99102
CONFIG_INET_XFRM_MODE_BEET=m
100103
CONFIG_INET_DIAG=m
104+
CONFIG_TCP_CONG_ADVANCED=y
105+
CONFIG_TCP_CONG_BBR=m
101106
CONFIG_IPV6=m
102107
CONFIG_IPV6_ROUTER_PREF=y
103108
CONFIG_INET6_AH=m
@@ -212,7 +217,6 @@ CONFIG_IP_VS_SED=m
212217
CONFIG_IP_VS_NQ=m
213218
CONFIG_IP_VS_FTP=m
214219
CONFIG_IP_VS_PE_SIP=m
215-
CONFIG_NF_CONNTRACK_IPV4=m
216220
CONFIG_IP_NF_IPTABLES=m
217221
CONFIG_IP_NF_MATCH_AH=m
218222
CONFIG_IP_NF_MATCH_ECN=m
@@ -232,7 +236,6 @@ CONFIG_IP_NF_RAW=m
232236
CONFIG_IP_NF_ARPTABLES=m
233237
CONFIG_IP_NF_ARPFILTER=m
234238
CONFIG_IP_NF_ARP_MANGLE=m
235-
CONFIG_NF_CONNTRACK_IPV6=m
236239
CONFIG_IP6_NF_IPTABLES=m
237240
CONFIG_IP6_NF_MATCH_AH=m
238241
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -306,11 +309,9 @@ CONFIG_NET_SCH_CHOKE=m
306309
CONFIG_NET_SCH_QFQ=m
307310
CONFIG_NET_SCH_CODEL=m
308311
CONFIG_NET_SCH_FQ_CODEL=m
312+
CONFIG_NET_SCH_FQ=m
309313
CONFIG_NET_SCH_INGRESS=m
310314
CONFIG_NET_SCH_PLUG=m
311-
CONFIG_NET_SCH_FQ=m
312-
CONFIG_TCP_CONG_ADVANCED=y
313-
CONFIG_TCP_CONG_BBR=m
314315
CONFIG_NET_CLS_BASIC=m
315316
CONFIG_NET_CLS_TCINDEX=m
316317
CONFIG_NET_CLS_ROUTE4=m
@@ -469,7 +470,6 @@ CONFIG_USB_NET_SR9700=m
469470
CONFIG_USB_NET_SR9800=m
470471
CONFIG_USB_NET_SMSC75XX=m
471472
CONFIG_USB_NET_SMSC95XX=y
472-
CONFIG_USB_LAN78XX=y
473473
CONFIG_USB_NET_GL620A=m
474474
CONFIG_USB_NET_NET1080=m
475475
CONFIG_USB_NET_PLUSB=m
@@ -591,7 +591,6 @@ CONFIG_HW_RANDOM=y
591591
CONFIG_RAW_DRIVER=y
592592
CONFIG_I2C=y
593593
CONFIG_I2C_CHARDEV=m
594-
CONFIG_I2C_MUX_PCA954x=m
595594
CONFIG_I2C_BCM2708=m
596595
CONFIG_I2C_BCM2835=m
597596
CONFIG_I2C_GPIO=m
@@ -603,7 +602,6 @@ CONFIG_PPS=m
603602
CONFIG_PPS_CLIENT_LDISC=m
604603
CONFIG_PPS_CLIENT_GPIO=m
605604
CONFIG_GPIO_SYSFS=y
606-
CONFIG_GPIO_BCM_EXP=y
607605
CONFIG_GPIO_BCM_VIRT=y
608606
CONFIG_GPIO_ARIZONA=m
609607
CONFIG_GPIO_STMPE=y
@@ -620,7 +618,6 @@ CONFIG_W1_SLAVE_DS2406=m
620618
CONFIG_W1_SLAVE_DS2423=m
621619
CONFIG_W1_SLAVE_DS2431=m
622620
CONFIG_W1_SLAVE_DS2433=m
623-
CONFIG_W1_SLAVE_DS2760=m
624621
CONFIG_W1_SLAVE_DS2780=m
625622
CONFIG_W1_SLAVE_DS2781=m
626623
CONFIG_W1_SLAVE_DS28E04=m
@@ -640,17 +637,6 @@ CONFIG_STMPE_SPI=y
640637
CONFIG_MFD_ARIZONA_I2C=m
641638
CONFIG_MFD_ARIZONA_SPI=m
642639
CONFIG_MFD_WM5102=y
643-
CONFIG_LIRC=m
644-
CONFIG_RC_DEVICES=y
645-
CONFIG_RC_ATI_REMOTE=m
646-
CONFIG_IR_IMON=m
647-
CONFIG_IR_MCEUSB=m
648-
CONFIG_IR_REDRAT3=m
649-
CONFIG_IR_STREAMZAP=m
650-
CONFIG_IR_IGUANA=m
651-
CONFIG_IR_TTUSBIR=m
652-
CONFIG_RC_LOOPBACK=m
653-
CONFIG_IR_GPIO_CIR=m
654640
CONFIG_MEDIA_SUPPORT=m
655641
CONFIG_MEDIA_CAMERA_SUPPORT=y
656642
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
@@ -721,51 +707,15 @@ CONFIG_VIDEO_GO7007=m
721707
CONFIG_VIDEO_GO7007_USB=m
722708
CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
723709
CONFIG_VIDEO_AU0828=m
724-
CONFIG_VIDEO_AU0828_RC=y
725-
CONFIG_VIDEO_CX231XX=m
726-
CONFIG_VIDEO_CX231XX_ALSA=m
727-
CONFIG_VIDEO_CX231XX_DVB=m
728-
CONFIG_VIDEO_TM6000=m
729-
CONFIG_VIDEO_TM6000_ALSA=m
730-
CONFIG_VIDEO_TM6000_DVB=m
731-
CONFIG_DVB_USB=m
732-
CONFIG_DVB_USB_A800=m
733-
CONFIG_DVB_USB_DIBUSB_MB=m
734-
CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
735-
CONFIG_DVB_USB_DIBUSB_MC=m
736-
CONFIG_DVB_USB_DIB0700=m
737-
CONFIG_DVB_USB_UMT_010=m
738-
CONFIG_DVB_USB_CXUSB=m
739-
CONFIG_DVB_USB_M920X=m
740-
CONFIG_DVB_USB_DIGITV=m
741-
CONFIG_DVB_USB_VP7045=m
742-
CONFIG_DVB_USB_VP702X=m
743-
CONFIG_DVB_USB_GP8PSK=m
744-
CONFIG_DVB_USB_NOVA_T_USB2=m
745-
CONFIG_DVB_USB_TTUSB2=m
746-
CONFIG_DVB_USB_DTT200U=m
747-
CONFIG_DVB_USB_OPERA1=m
748-
CONFIG_DVB_USB_AF9005=m
749-
CONFIG_DVB_USB_AF9005_REMOTE=m
750-
CONFIG_DVB_USB_PCTV452E=m
751-
CONFIG_DVB_USB_DW2102=m
752-
CONFIG_DVB_USB_CINERGY_T2=m
753-
CONFIG_DVB_USB_DTV5100=m
754-
CONFIG_DVB_USB_FRIIO=m
755-
CONFIG_DVB_USB_AZ6027=m
756-
CONFIG_DVB_USB_TECHNISAT_USB2=m
757710
CONFIG_DVB_USB_V2=m
758-
CONFIG_DVB_USB_AF9015=m
759711
CONFIG_DVB_USB_AF9035=m
760712
CONFIG_DVB_USB_ANYSEE=m
761713
CONFIG_DVB_USB_AU6610=m
762714
CONFIG_DVB_USB_AZ6007=m
763715
CONFIG_DVB_USB_CE6230=m
764716
CONFIG_DVB_USB_EC168=m
765717
CONFIG_DVB_USB_GL861=m
766-
CONFIG_DVB_USB_LME2510=m
767718
CONFIG_DVB_USB_MXL111SF=m
768-
CONFIG_DVB_USB_RTL28XXU=m
769719
CONFIG_DVB_USB_DVBSKY=m
770720
CONFIG_SMS_USB_DRV=m
771721
CONFIG_DVB_B2C2_FLEXCOP_USB=m
@@ -775,7 +725,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
775725
CONFIG_VIDEO_EM28XX_ALSA=m
776726
CONFIG_VIDEO_EM28XX_DVB=m
777727
CONFIG_V4L_PLATFORM_DRIVERS=y
778-
CONFIG_RADIO_SI470X=y
728+
CONFIG_RADIO_SI470X=m
779729
CONFIG_USB_SI470X=m
780730
CONFIG_I2C_SI470X=m
781731
CONFIG_RADIO_SI4713=m
@@ -1019,7 +969,6 @@ CONFIG_MMC_SDHCI=y
1019969
CONFIG_MMC_SDHCI_PLTFM=y
1020970
CONFIG_MMC_SDHCI_IPROC=m
1021971
CONFIG_MMC_SPI=m
1022-
CONFIG_MMC_BCM2835=y
1023972
CONFIG_LEDS_CLASS=y
1024973
CONFIG_LEDS_GPIO=y
1025974
CONFIG_LEDS_TRIGGER_TIMER=y
@@ -1073,29 +1022,13 @@ CONFIG_DMA_BCM2708=y
10731022
CONFIG_UIO=m
10741023
CONFIG_UIO_PDRV_GENIRQ=m
10751024
CONFIG_STAGING=y
1076-
CONFIG_IRDA=m
1077-
CONFIG_IRLAN=m
1078-
CONFIG_IRNET=m
1079-
CONFIG_IRCOMM=m
1080-
CONFIG_IRDA_ULTRA=y
1081-
CONFIG_IRDA_CACHE_LAST_LSAP=y
1082-
CONFIG_IRDA_FAST_RR=y
1083-
CONFIG_IRTTY_SIR=m
1084-
CONFIG_KINGSUN_DONGLE=m
1085-
CONFIG_KSDAZZLE_DONGLE=m
1086-
CONFIG_KS959_DONGLE=m
1087-
CONFIG_USB_IRDA=m
1088-
CONFIG_SIGMATEL_FIR=m
1089-
CONFIG_MCS_FIR=m
10901025
CONFIG_PRISM2_USB=m
10911026
CONFIG_R8712U=m
10921027
CONFIG_R8188EU=m
10931028
CONFIG_VT6656=m
10941029
CONFIG_SPEAKUP=m
10951030
CONFIG_SPEAKUP_SYNTH_SOFT=m
10961031
CONFIG_STAGING_MEDIA=y
1097-
CONFIG_LIRC_STAGING=y
1098-
CONFIG_LIRC_RPI=m
10991032
CONFIG_FB_TFT=m
11001033
CONFIG_FB_TFT_AGM1264K_FL=m
11011034
CONFIG_FB_TFT_BD663474=m
@@ -1143,7 +1076,6 @@ CONFIG_DHT11=m
11431076
CONFIG_HTU21=m
11441077
CONFIG_PWM_BCM2835=m
11451078
CONFIG_PWM_PCA9685=m
1146-
CONFIG_RASPBERRYPI_FIRMWARE=y
11471079
CONFIG_EXT4_FS=y
11481080
CONFIG_EXT4_FS_POSIX_ACL=y
11491081
CONFIG_EXT4_FS_SECURITY=y
@@ -1255,19 +1187,6 @@ CONFIG_NLS_ISO8859_15=m
12551187
CONFIG_NLS_KOI8_R=m
12561188
CONFIG_NLS_KOI8_U=m
12571189
CONFIG_DLM=m
1258-
CONFIG_PRINTK_TIME=y
1259-
CONFIG_BOOT_PRINTK_DELAY=y
1260-
CONFIG_DEBUG_MEMORY_INIT=y
1261-
CONFIG_DETECT_HUNG_TASK=y
1262-
CONFIG_LATENCYTOP=y
1263-
CONFIG_IRQSOFF_TRACER=y
1264-
CONFIG_SCHED_TRACER=y
1265-
CONFIG_STACK_TRACER=y
1266-
CONFIG_BLK_DEV_IO_TRACE=y
1267-
CONFIG_FUNCTION_PROFILER=y
1268-
CONFIG_KGDB=y
1269-
CONFIG_KGDB_KDB=y
1270-
CONFIG_KDB_KEYBOARD=y
12711190
CONFIG_CRYPTO_USER=m
12721191
CONFIG_CRYPTO_CBC=y
12731192
CONFIG_CRYPTO_CTS=m
@@ -1279,11 +1198,18 @@ CONFIG_CRYPTO_CAST5=m
12791198
CONFIG_CRYPTO_DES=y
12801199
CONFIG_CRYPTO_LZ4=m
12811200
CONFIG_CRYPTO_USER_API_SKCIPHER=m
1282-
CONFIG_ARM64_CRYPTO=y
1283-
CONFIG_CRYPTO_AES_ARM64=m
1284-
CONFIG_CRYPTO_AES_ARM64_BS=m
1285-
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
12861201
CONFIG_CRC_ITU_T=y
12871202
CONFIG_LIBCRC32C=y
1288-
CONFIG_MMC_BCM2835_MMC=y
1289-
CONFIG_MMC_SDHCI_IPROC=m
1203+
CONFIG_PRINTK_TIME=y
1204+
CONFIG_BOOT_PRINTK_DELAY=y
1205+
CONFIG_DEBUG_MEMORY_INIT=y
1206+
CONFIG_DETECT_HUNG_TASK=y
1207+
CONFIG_LATENCYTOP=y
1208+
CONFIG_IRQSOFF_TRACER=y
1209+
CONFIG_SCHED_TRACER=y
1210+
CONFIG_STACK_TRACER=y
1211+
CONFIG_BLK_DEV_IO_TRACE=y
1212+
CONFIG_FUNCTION_PROFILER=y
1213+
CONFIG_KGDB=y
1214+
CONFIG_KGDB_KDB=y
1215+
CONFIG_KDB_KEYBOARD=y

0 commit comments

Comments
 (0)