Skip to content

Commit 977c0fc

Browse files
authored
Merge pull request #128 from jenneron/configs
config changes
2 parents 1adff05 + f9b0e87 commit 977c0fc

File tree

2 files changed

+9
-161
lines changed

2 files changed

+9
-161
lines changed

arch/arm/configs/grate_defconfig

Lines changed: 8 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_KERNEL_XZ=y
3-
# CONFIG_SWAP is not set
43
CONFIG_SYSVIPC=y
54
CONFIG_WATCH_QUEUE=y
65
CONFIG_NO_HZ_IDLE=y
76
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_PREEMPT_VOLUNTARY=y
88
# CONFIG_CPU_ISOLATION is not set
99
CONFIG_IKCONFIG=y
1010
CONFIG_IKCONFIG_PROC=y
@@ -25,7 +25,6 @@ CONFIG_BOOT_CONFIG=y
2525
# CONFIG_SYSFS_SYSCALL is not set
2626
CONFIG_EMBEDDED=y
2727
CONFIG_PERF_EVENTS=y
28-
CONFIG_SLOB=y
2928
CONFIG_ARCH_TEGRA=y
3029
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
3130
CONFIG_SMP=y
@@ -56,6 +55,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
5655
CONFIG_PARTITION_ADVANCED=y
5756
# CONFIG_MQ_IOSCHED_DEADLINE is not set
5857
# CONFIG_COREDUMP is not set
58+
# CONFIG_SWAP is not set
59+
CONFIG_SLOB=y
5960
CONFIG_CMA=y
6061
CONFIG_NET=y
6162
CONFIG_PACKET=y
@@ -264,167 +265,15 @@ CONFIG_REGULATOR_TPS62360=y
264265
CONFIG_REGULATOR_TPS65090=y
265266
CONFIG_REGULATOR_TPS6586X=y
266267
CONFIG_REGULATOR_TPS65910=y
267-
# CONFIG_MEDIA_CEC_SUPPORT is not set
268-
CONFIG_MEDIA_SUPPORT=y
269-
CONFIG_VIDEO_DEV=m
270-
# CONFIG_DVB_NET is not set
271-
CONFIG_DVB_MAX_ADAPTERS=1
272-
# CONFIG_DVB_DYNAMIC_MINORS is not set
268+
CONFIG_MEDIA_SUPPORT=m
269+
CONFIG_MEDIA_SUPPORT_FILTER=y
270+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
271+
CONFIG_MEDIA_CAMERA_SUPPORT=y
272+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
273273
CONFIG_MEDIA_USB_SUPPORT=y
274274
CONFIG_USB_VIDEO_CLASS=m
275-
# CONFIG_RADIO_ADAPTERS is not set
276275
CONFIG_V4L_MEM2MEM_DRIVERS=y
277276
CONFIG_VIDEO_TEGRA_VDE=m
278-
# CONFIG_CXD2880_SPI_DRV is not set
279-
# CONFIG_MEDIA_TUNER_E4000 is not set
280-
# CONFIG_MEDIA_TUNER_FC0011 is not set
281-
# CONFIG_MEDIA_TUNER_FC0012 is not set
282-
# CONFIG_MEDIA_TUNER_FC0013 is not set
283-
# CONFIG_MEDIA_TUNER_FC2580 is not set
284-
# CONFIG_MEDIA_TUNER_IT913X is not set
285-
# CONFIG_MEDIA_TUNER_M88RS6000T is not set
286-
# CONFIG_MEDIA_TUNER_MAX2165 is not set
287-
# CONFIG_MEDIA_TUNER_MC44S803 is not set
288-
# CONFIG_MEDIA_TUNER_MSI001 is not set
289-
# CONFIG_MEDIA_TUNER_MT2060 is not set
290-
# CONFIG_MEDIA_TUNER_MT2063 is not set
291-
# CONFIG_MEDIA_TUNER_MT20XX is not set
292-
# CONFIG_MEDIA_TUNER_MT2131 is not set
293-
# CONFIG_MEDIA_TUNER_MT2266 is not set
294-
# CONFIG_MEDIA_TUNER_MXL301RF is not set
295-
# CONFIG_MEDIA_TUNER_MXL5005S is not set
296-
# CONFIG_MEDIA_TUNER_MXL5007T is not set
297-
# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
298-
# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
299-
# CONFIG_MEDIA_TUNER_QT1010 is not set
300-
# CONFIG_MEDIA_TUNER_R820T is not set
301-
# CONFIG_MEDIA_TUNER_SI2157 is not set
302-
# CONFIG_MEDIA_TUNER_SIMPLE is not set
303-
# CONFIG_MEDIA_TUNER_TDA18212 is not set
304-
# CONFIG_MEDIA_TUNER_TDA18218 is not set
305-
# CONFIG_MEDIA_TUNER_TDA18250 is not set
306-
# CONFIG_MEDIA_TUNER_TDA18271 is not set
307-
# CONFIG_MEDIA_TUNER_TDA827X is not set
308-
# CONFIG_MEDIA_TUNER_TDA8290 is not set
309-
# CONFIG_MEDIA_TUNER_TDA9887 is not set
310-
# CONFIG_MEDIA_TUNER_TEA5761 is not set
311-
# CONFIG_MEDIA_TUNER_TEA5767 is not set
312-
# CONFIG_MEDIA_TUNER_TUA9001 is not set
313-
# CONFIG_MEDIA_TUNER_XC2028 is not set
314-
# CONFIG_MEDIA_TUNER_XC4000 is not set
315-
# CONFIG_MEDIA_TUNER_XC5000 is not set
316-
# CONFIG_DVB_M88DS3103 is not set
317-
# CONFIG_DVB_MXL5XX is not set
318-
# CONFIG_DVB_STB0899 is not set
319-
# CONFIG_DVB_STB6100 is not set
320-
# CONFIG_DVB_STV090x is not set
321-
# CONFIG_DVB_STV0910 is not set
322-
# CONFIG_DVB_STV6110x is not set
323-
# CONFIG_DVB_STV6111 is not set
324-
# CONFIG_DVB_DRXK is not set
325-
# CONFIG_DVB_MN88472 is not set
326-
# CONFIG_DVB_MN88473 is not set
327-
# CONFIG_DVB_SI2165 is not set
328-
# CONFIG_DVB_TDA18271C2DD is not set
329-
# CONFIG_DVB_CX24110 is not set
330-
# CONFIG_DVB_CX24116 is not set
331-
# CONFIG_DVB_CX24117 is not set
332-
# CONFIG_DVB_CX24120 is not set
333-
# CONFIG_DVB_CX24123 is not set
334-
# CONFIG_DVB_DS3000 is not set
335-
# CONFIG_DVB_MB86A16 is not set
336-
# CONFIG_DVB_MT312 is not set
337-
# CONFIG_DVB_S5H1420 is not set
338-
# CONFIG_DVB_SI21XX is not set
339-
# CONFIG_DVB_STB6000 is not set
340-
# CONFIG_DVB_STV0288 is not set
341-
# CONFIG_DVB_STV0299 is not set
342-
# CONFIG_DVB_STV0900 is not set
343-
# CONFIG_DVB_STV6110 is not set
344-
# CONFIG_DVB_TDA10071 is not set
345-
# CONFIG_DVB_TDA10086 is not set
346-
# CONFIG_DVB_TDA8083 is not set
347-
# CONFIG_DVB_TDA8261 is not set
348-
# CONFIG_DVB_TDA826X is not set
349-
# CONFIG_DVB_TS2020 is not set
350-
# CONFIG_DVB_TUA6100 is not set
351-
# CONFIG_DVB_TUNER_CX24113 is not set
352-
# CONFIG_DVB_TUNER_ITD1000 is not set
353-
# CONFIG_DVB_VES1X93 is not set
354-
# CONFIG_DVB_ZL10036 is not set
355-
# CONFIG_DVB_ZL10039 is not set
356-
# CONFIG_DVB_AF9013 is not set
357-
# CONFIG_DVB_CX22700 is not set
358-
# CONFIG_DVB_CX22702 is not set
359-
# CONFIG_DVB_CXD2820R is not set
360-
# CONFIG_DVB_CXD2841ER is not set
361-
# CONFIG_DVB_DIB3000MB is not set
362-
# CONFIG_DVB_DIB3000MC is not set
363-
# CONFIG_DVB_DIB7000M is not set
364-
# CONFIG_DVB_DIB7000P is not set
365-
# CONFIG_DVB_DIB9000 is not set
366-
# CONFIG_DVB_DRXD is not set
367-
# CONFIG_DVB_EC100 is not set
368-
# CONFIG_DVB_L64781 is not set
369-
# CONFIG_DVB_MT352 is not set
370-
# CONFIG_DVB_NXT6000 is not set
371-
# CONFIG_DVB_RTL2830 is not set
372-
# CONFIG_DVB_RTL2832 is not set
373-
# CONFIG_DVB_RTL2832_SDR is not set
374-
# CONFIG_DVB_S5H1432 is not set
375-
# CONFIG_DVB_SI2168 is not set
376-
# CONFIG_DVB_SP887X is not set
377-
# CONFIG_DVB_STV0367 is not set
378-
# CONFIG_DVB_TDA10048 is not set
379-
# CONFIG_DVB_TDA1004X is not set
380-
# CONFIG_DVB_ZD1301_DEMOD is not set
381-
# CONFIG_DVB_ZL10353 is not set
382-
# CONFIG_DVB_CXD2880 is not set
383-
# CONFIG_DVB_STV0297 is not set
384-
# CONFIG_DVB_TDA10021 is not set
385-
# CONFIG_DVB_TDA10023 is not set
386-
# CONFIG_DVB_VES1820 is not set
387-
# CONFIG_DVB_AU8522_DTV is not set
388-
# CONFIG_DVB_AU8522_V4L is not set
389-
# CONFIG_DVB_BCM3510 is not set
390-
# CONFIG_DVB_LG2160 is not set
391-
# CONFIG_DVB_LGDT3305 is not set
392-
# CONFIG_DVB_LGDT3306A is not set
393-
# CONFIG_DVB_LGDT330X is not set
394-
# CONFIG_DVB_NXT200X is not set
395-
# CONFIG_DVB_OR51132 is not set
396-
# CONFIG_DVB_OR51211 is not set
397-
# CONFIG_DVB_S5H1409 is not set
398-
# CONFIG_DVB_S5H1411 is not set
399-
# CONFIG_DVB_DIB8000 is not set
400-
# CONFIG_DVB_MB86A20S is not set
401-
# CONFIG_DVB_S921 is not set
402-
# CONFIG_DVB_MN88443X is not set
403-
# CONFIG_DVB_TC90522 is not set
404-
# CONFIG_DVB_PLL is not set
405-
# CONFIG_DVB_TUNER_DIB0070 is not set
406-
# CONFIG_DVB_TUNER_DIB0090 is not set
407-
# CONFIG_DVB_A8293 is not set
408-
# CONFIG_DVB_AF9033 is not set
409-
# CONFIG_DVB_ASCOT2E is not set
410-
# CONFIG_DVB_ATBM8830 is not set
411-
# CONFIG_DVB_HELENE is not set
412-
# CONFIG_DVB_HORUS3A is not set
413-
# CONFIG_DVB_ISL6405 is not set
414-
# CONFIG_DVB_ISL6421 is not set
415-
# CONFIG_DVB_ISL6423 is not set
416-
# CONFIG_DVB_IX2505V is not set
417-
# CONFIG_DVB_LGS8GL5 is not set
418-
# CONFIG_DVB_LGS8GXX is not set
419-
# CONFIG_DVB_LNBH25 is not set
420-
# CONFIG_DVB_LNBH29 is not set
421-
# CONFIG_DVB_LNBP21 is not set
422-
# CONFIG_DVB_LNBP22 is not set
423-
# CONFIG_DVB_M88RS2000 is not set
424-
# CONFIG_DVB_TDA665x is not set
425-
# CONFIG_DVB_DRX39XYJ is not set
426-
# CONFIG_DVB_CXD2099 is not set
427-
# CONFIG_DVB_SP2 is not set
428277
CONFIG_DRM=y
429278
CONFIG_DRM_I2C_CH7006=m
430279
CONFIG_DRM_I2C_SIL164=m
@@ -532,7 +381,6 @@ CONFIG_RTC_DRV_TPS65910=m
532381
CONFIG_RTC_DRV_EM3027=m
533382
CONFIG_RTC_DRV_TEGRA=y
534383
CONFIG_DMADEVICES=y
535-
CONFIG_TEGRA20_APB_DMA=y
536384
# CONFIG_VIRTIO_MENU is not set
537385
# CONFIG_VHOST_MENU is not set
538386
CONFIG_STAGING=y

kernel/configs/pmos.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CONFIG_ASHMEM=y
5353
CONFIG_ANDROID=y
5454
CONFIG_ANDROID_BINDER_IPC=y
5555
CONFIG_ANDROID_BINDERFS=n
56-
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder"
56+
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
5757
CONFIG_NETFILTER_XTABLES=m
5858
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
5959
CONFIG_IP_NF_MANGLE=m

0 commit comments

Comments
 (0)