1 From 4e5178b323d2710d9cf8b0fcabfabc48400a3797 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Mon, 12 Nov 2018 21:42:00 +0000
4 Subject: [PATCH 150/806] configs: Rebuild bcmrpi3_defconfig to fix warnings
6 Also disable CONFIG_MMC_BCM2835 to avoid a runtime conflict.
8 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
10 arch/arm64/configs/bcmrpi3_defconfig | 148 +++++++--------------------
11 1 file changed, 37 insertions(+), 111 deletions(-)
13 --- a/arch/arm64/configs/bcmrpi3_defconfig
14 +++ b/arch/arm64/configs/bcmrpi3_defconfig
15 @@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y
18 CONFIG_HIGH_RES_TIMERS=y
20 CONFIG_BSD_PROCESS_ACCT=y
21 CONFIG_BSD_PROCESS_ACCT_V3=y
23 @@ -25,29 +26,13 @@ CONFIG_BLK_DEV_INITRD=y
25 # CONFIG_COMPAT_BRK is not set
30 -CONFIG_MODULE_UNLOAD=y
32 -CONFIG_MODULE_SRCVERSION_ALL=y
33 -CONFIG_BLK_DEV_THROTTLING=y
34 -CONFIG_PARTITION_ADVANCED=y
35 -CONFIG_MAC_PARTITION=y
36 -CONFIG_CFQ_GROUP_IOSCHED=y
38 # CONFIG_CAVIUM_ERRATUM_22375 is not set
39 # CONFIG_CAVIUM_ERRATUM_23154 is not set
40 # CONFIG_CAVIUM_ERRATUM_27456 is not set
49 -CONFIG_PGTABLE_MAPPING=y
51 CONFIG_ARMV8_DEPRECATED=y
52 CONFIG_SWP_EMULATION=y
53 @@ -55,7 +40,6 @@ CONFIG_CP15_BARRIER_EMULATION=y
54 CONFIG_SETEND_EMULATION=y
55 CONFIG_RANDOMIZE_BASE=y
56 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
59 # CONFIG_SUSPEND is not set
61 @@ -69,6 +53,25 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
62 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
63 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
64 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
65 +CONFIG_RASPBERRYPI_FIRMWARE=y
66 +CONFIG_ARM64_CRYPTO=y
67 +CONFIG_CRYPTO_AES_ARM64_BS=m
71 +CONFIG_MODULE_UNLOAD=y
73 +CONFIG_MODULE_SRCVERSION_ALL=y
74 +CONFIG_BLK_DEV_THROTTLING=y
75 +CONFIG_PARTITION_ADVANCED=y
76 +CONFIG_MAC_PARTITION=y
77 +CONFIG_CFQ_GROUP_IOSCHED=y
83 +CONFIG_PGTABLE_MAPPING=y
87 @@ -98,6 +101,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
88 CONFIG_INET_XFRM_MODE_TUNNEL=m
89 CONFIG_INET_XFRM_MODE_BEET=m
91 +CONFIG_TCP_CONG_ADVANCED=y
92 +CONFIG_TCP_CONG_BBR=m
94 CONFIG_IPV6_ROUTER_PREF=y
96 @@ -212,7 +217,6 @@ CONFIG_IP_VS_SED=m
100 -CONFIG_NF_CONNTRACK_IPV4=m
101 CONFIG_IP_NF_IPTABLES=m
102 CONFIG_IP_NF_MATCH_AH=m
103 CONFIG_IP_NF_MATCH_ECN=m
104 @@ -232,7 +236,6 @@ CONFIG_IP_NF_RAW=m
105 CONFIG_IP_NF_ARPTABLES=m
106 CONFIG_IP_NF_ARPFILTER=m
107 CONFIG_IP_NF_ARP_MANGLE=m
108 -CONFIG_NF_CONNTRACK_IPV6=m
109 CONFIG_IP6_NF_IPTABLES=m
110 CONFIG_IP6_NF_MATCH_AH=m
111 CONFIG_IP6_NF_MATCH_EUI64=m
112 @@ -306,11 +309,9 @@ CONFIG_NET_SCH_CHOKE=m
114 CONFIG_NET_SCH_CODEL=m
115 CONFIG_NET_SCH_FQ_CODEL=m
117 CONFIG_NET_SCH_INGRESS=m
118 CONFIG_NET_SCH_PLUG=m
120 -CONFIG_TCP_CONG_ADVANCED=y
121 -CONFIG_TCP_CONG_BBR=m
122 CONFIG_NET_CLS_BASIC=m
123 CONFIG_NET_CLS_TCINDEX=m
124 CONFIG_NET_CLS_ROUTE4=m
125 @@ -469,7 +470,6 @@ CONFIG_USB_NET_SR9700=m
126 CONFIG_USB_NET_SR9800=m
127 CONFIG_USB_NET_SMSC75XX=m
128 CONFIG_USB_NET_SMSC95XX=y
129 -CONFIG_USB_LAN78XX=y
130 CONFIG_USB_NET_GL620A=m
131 CONFIG_USB_NET_NET1080=m
132 CONFIG_USB_NET_PLUSB=m
133 @@ -591,7 +591,6 @@ CONFIG_HW_RANDOM=y
137 -CONFIG_I2C_MUX_PCA954x=m
141 @@ -603,7 +602,6 @@ CONFIG_PPS=m
142 CONFIG_PPS_CLIENT_LDISC=m
143 CONFIG_PPS_CLIENT_GPIO=m
145 -CONFIG_GPIO_BCM_EXP=y
146 CONFIG_GPIO_BCM_VIRT=y
147 CONFIG_GPIO_ARIZONA=m
149 @@ -620,7 +618,6 @@ CONFIG_W1_SLAVE_DS2406=m
150 CONFIG_W1_SLAVE_DS2423=m
151 CONFIG_W1_SLAVE_DS2431=m
152 CONFIG_W1_SLAVE_DS2433=m
153 -CONFIG_W1_SLAVE_DS2760=m
154 CONFIG_W1_SLAVE_DS2780=m
155 CONFIG_W1_SLAVE_DS2781=m
156 CONFIG_W1_SLAVE_DS28E04=m
157 @@ -640,17 +637,6 @@ CONFIG_STMPE_SPI=y
158 CONFIG_MFD_ARIZONA_I2C=m
159 CONFIG_MFD_ARIZONA_SPI=m
163 -CONFIG_RC_ATI_REMOTE=m
167 -CONFIG_IR_STREAMZAP=m
170 -CONFIG_RC_LOOPBACK=m
171 -CONFIG_IR_GPIO_CIR=m
172 CONFIG_MEDIA_SUPPORT=m
173 CONFIG_MEDIA_CAMERA_SUPPORT=y
174 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
175 @@ -721,41 +707,7 @@ CONFIG_VIDEO_GO7007=m
176 CONFIG_VIDEO_GO7007_USB=m
177 CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
178 CONFIG_VIDEO_AU0828=m
179 -CONFIG_VIDEO_AU0828_RC=y
180 -CONFIG_VIDEO_CX231XX=m
181 -CONFIG_VIDEO_CX231XX_ALSA=m
182 -CONFIG_VIDEO_CX231XX_DVB=m
183 -CONFIG_VIDEO_TM6000=m
184 -CONFIG_VIDEO_TM6000_ALSA=m
185 -CONFIG_VIDEO_TM6000_DVB=m
187 -CONFIG_DVB_USB_A800=m
188 -CONFIG_DVB_USB_DIBUSB_MB=m
189 -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
190 -CONFIG_DVB_USB_DIBUSB_MC=m
191 -CONFIG_DVB_USB_DIB0700=m
192 -CONFIG_DVB_USB_UMT_010=m
193 -CONFIG_DVB_USB_CXUSB=m
194 -CONFIG_DVB_USB_M920X=m
195 -CONFIG_DVB_USB_DIGITV=m
196 -CONFIG_DVB_USB_VP7045=m
197 -CONFIG_DVB_USB_VP702X=m
198 -CONFIG_DVB_USB_GP8PSK=m
199 -CONFIG_DVB_USB_NOVA_T_USB2=m
200 -CONFIG_DVB_USB_TTUSB2=m
201 -CONFIG_DVB_USB_DTT200U=m
202 -CONFIG_DVB_USB_OPERA1=m
203 -CONFIG_DVB_USB_AF9005=m
204 -CONFIG_DVB_USB_AF9005_REMOTE=m
205 -CONFIG_DVB_USB_PCTV452E=m
206 -CONFIG_DVB_USB_DW2102=m
207 -CONFIG_DVB_USB_CINERGY_T2=m
208 -CONFIG_DVB_USB_DTV5100=m
209 -CONFIG_DVB_USB_FRIIO=m
210 -CONFIG_DVB_USB_AZ6027=m
211 -CONFIG_DVB_USB_TECHNISAT_USB2=m
213 -CONFIG_DVB_USB_AF9015=m
214 CONFIG_DVB_USB_AF9035=m
215 CONFIG_DVB_USB_ANYSEE=m
216 CONFIG_DVB_USB_AU6610=m
217 @@ -763,9 +715,7 @@ CONFIG_DVB_USB_AZ6007=m
218 CONFIG_DVB_USB_CE6230=m
219 CONFIG_DVB_USB_EC168=m
220 CONFIG_DVB_USB_GL861=m
221 -CONFIG_DVB_USB_LME2510=m
222 CONFIG_DVB_USB_MXL111SF=m
223 -CONFIG_DVB_USB_RTL28XXU=m
224 CONFIG_DVB_USB_DVBSKY=m
226 CONFIG_DVB_B2C2_FLEXCOP_USB=m
227 @@ -775,7 +725,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
228 CONFIG_VIDEO_EM28XX_ALSA=m
229 CONFIG_VIDEO_EM28XX_DVB=m
230 CONFIG_V4L_PLATFORM_DRIVERS=y
231 -CONFIG_RADIO_SI470X=y
232 +CONFIG_RADIO_SI470X=m
235 CONFIG_RADIO_SI4713=m
236 @@ -1019,7 +969,6 @@ CONFIG_MMC_SDHCI=y
237 CONFIG_MMC_SDHCI_PLTFM=y
238 CONFIG_MMC_SDHCI_IPROC=m
240 -CONFIG_MMC_BCM2835=y
243 CONFIG_LEDS_TRIGGER_TIMER=y
244 @@ -1073,20 +1022,6 @@ CONFIG_DMA_BCM2708=y
246 CONFIG_UIO_PDRV_GENIRQ=m
253 -CONFIG_IRDA_CACHE_LAST_LSAP=y
254 -CONFIG_IRDA_FAST_RR=y
256 -CONFIG_KINGSUN_DONGLE=m
257 -CONFIG_KSDAZZLE_DONGLE=m
258 -CONFIG_KS959_DONGLE=m
260 -CONFIG_SIGMATEL_FIR=m
265 @@ -1094,8 +1029,6 @@ CONFIG_VT6656=m
267 CONFIG_SPEAKUP_SYNTH_SOFT=m
268 CONFIG_STAGING_MEDIA=y
269 -CONFIG_LIRC_STAGING=y
272 CONFIG_FB_TFT_AGM1264K_FL=m
273 CONFIG_FB_TFT_BD663474=m
274 @@ -1143,7 +1076,6 @@ CONFIG_DHT11=m
278 -CONFIG_RASPBERRYPI_FIRMWARE=y
280 CONFIG_EXT4_FS_POSIX_ACL=y
281 CONFIG_EXT4_FS_SECURITY=y
282 @@ -1255,19 +1187,6 @@ CONFIG_NLS_ISO8859_15=m
286 -CONFIG_PRINTK_TIME=y
287 -CONFIG_BOOT_PRINTK_DELAY=y
288 -CONFIG_DEBUG_MEMORY_INIT=y
289 -CONFIG_DETECT_HUNG_TASK=y
291 -CONFIG_IRQSOFF_TRACER=y
292 -CONFIG_SCHED_TRACER=y
293 -CONFIG_STACK_TRACER=y
294 -CONFIG_BLK_DEV_IO_TRACE=y
295 -CONFIG_FUNCTION_PROFILER=y
298 -CONFIG_KDB_KEYBOARD=y
302 @@ -1279,11 +1198,18 @@ CONFIG_CRYPTO_CAST5=m
305 CONFIG_CRYPTO_USER_API_SKCIPHER=m
306 -CONFIG_ARM64_CRYPTO=y
307 -CONFIG_CRYPTO_AES_ARM64=m
308 -CONFIG_CRYPTO_AES_ARM64_BS=m
309 -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
312 -CONFIG_MMC_BCM2835_MMC=y
313 -CONFIG_MMC_SDHCI_IPROC=m
314 +CONFIG_PRINTK_TIME=y
315 +CONFIG_BOOT_PRINTK_DELAY=y
316 +CONFIG_DEBUG_MEMORY_INIT=y
317 +CONFIG_DETECT_HUNG_TASK=y
319 +CONFIG_IRQSOFF_TRACER=y
320 +CONFIG_SCHED_TRACER=y
321 +CONFIG_STACK_TRACER=y
322 +CONFIG_BLK_DEV_IO_TRACE=y
323 +CONFIG_FUNCTION_PROFILER=y
326 +CONFIG_KDB_KEYBOARD=y