kernel
修訂 | a31e11bc400d5f144b4e7de8495549d718e771ed (tree) |
---|---|
時間 | 2018-02-06 01:00:47 |
作者 | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
Android-x86: update defconfig for the 7.1-r1 release
@@ -1,6 +1,6 @@ | ||
1 | 1 | # |
2 | 2 | # Automatically generated file; DO NOT EDIT. |
3 | -# Linux/x86_64 4.9.54 Kernel Configuration | |
3 | +# Linux/x86_64 4.9.80 Kernel Configuration | |
4 | 4 | # |
5 | 5 | CONFIG_64BIT=y |
6 | 6 | CONFIG_X86_64=y |
@@ -388,6 +388,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y | ||
388 | 388 | # CONFIG_X86_X2APIC is not set |
389 | 389 | CONFIG_X86_MPPARSE=y |
390 | 390 | # CONFIG_GOLDFISH is not set |
391 | +CONFIG_RETPOLINE=y | |
391 | 392 | CONFIG_X86_EXTENDED_PLATFORM=y |
392 | 393 | # CONFIG_X86_VSMP is not set |
393 | 394 | # CONFIG_X86_GOLDFISH is not set |
@@ -624,6 +625,7 @@ CONFIG_PMIC_OPREGION=y | ||
624 | 625 | CONFIG_CRC_PMIC_OPREGION=y |
625 | 626 | CONFIG_XPOWER_PMIC_OPREGION=y |
626 | 627 | CONFIG_BXT_WC_PMIC_OPREGION=y |
628 | +CONFIG_CHT_WC_PMIC_OPREGION=y | |
627 | 629 | # CONFIG_ACPI_CONFIGFS is not set |
628 | 630 | CONFIG_SFI=y |
629 | 631 |
@@ -640,7 +642,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y | ||
640 | 642 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
641 | 643 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
642 | 644 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
643 | -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set | |
644 | 645 | # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set |
645 | 646 | # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set |
646 | 647 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
@@ -648,7 +649,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y | ||
648 | 649 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
649 | 650 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
650 | 651 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
651 | -# CONFIG_CPU_FREQ_GOV_SCHED is not set | |
652 | 652 | # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set |
653 | 653 | # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set |
654 | 654 |
@@ -1075,6 +1075,7 @@ CONFIG_STP=m | ||
1075 | 1075 | CONFIG_BRIDGE=m |
1076 | 1076 | CONFIG_BRIDGE_IGMP_SNOOPING=y |
1077 | 1077 | CONFIG_HAVE_NET_DSA=y |
1078 | +# CONFIG_NET_DSA is not set | |
1078 | 1079 | # CONFIG_VLAN_8021Q is not set |
1079 | 1080 | # CONFIG_DECNET is not set |
1080 | 1081 | CONFIG_LLC=m |
@@ -1319,6 +1320,7 @@ CONFIG_DEV_COREDUMP=y | ||
1319 | 1320 | # CONFIG_SYS_HYPERVISOR is not set |
1320 | 1321 | # CONFIG_GENERIC_CPU_DEVICES is not set |
1321 | 1322 | CONFIG_GENERIC_CPU_AUTOPROBE=y |
1323 | +CONFIG_GENERIC_CPU_VULNERABILITIES=y | |
1322 | 1324 | CONFIG_REGMAP=y |
1323 | 1325 | CONFIG_REGMAP_I2C=y |
1324 | 1326 | CONFIG_REGMAP_SPI=y |
@@ -2888,7 +2890,7 @@ CONFIG_DEVMEM=y | ||
2888 | 2890 | # |
2889 | 2891 | CONFIG_SERIAL_EARLYCON=y |
2890 | 2892 | CONFIG_SERIAL_8250=y |
2891 | -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y | |
2893 | +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set | |
2892 | 2894 | CONFIG_SERIAL_8250_PNP=y |
2893 | 2895 | # CONFIG_SERIAL_8250_FINTEK is not set |
2894 | 2896 | CONFIG_SERIAL_8250_CONSOLE=y |
@@ -2904,10 +2906,10 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
2904 | 2906 | CONFIG_SERIAL_8250_RSA=y |
2905 | 2907 | # CONFIG_SERIAL_8250_FSL is not set |
2906 | 2908 | CONFIG_SERIAL_8250_DW=m |
2907 | -# CONFIG_SERIAL_8250_RT288X is not set | |
2908 | -CONFIG_SERIAL_8250_LPSS=y | |
2909 | -# CONFIG_SERIAL_8250_MID is not set | |
2910 | -# CONFIG_SERIAL_8250_MOXA is not set | |
2909 | +CONFIG_SERIAL_8250_RT288X=y | |
2910 | +CONFIG_SERIAL_8250_LPSS=m | |
2911 | +CONFIG_SERIAL_8250_MID=m | |
2912 | +CONFIG_SERIAL_8250_MOXA=m | |
2911 | 2913 | # CONFIG_SERIAL_OF_PLATFORM is not set |
2912 | 2914 | |
2913 | 2915 | # |
@@ -3023,8 +3025,8 @@ CONFIG_I2C_SCMI=m | ||
3023 | 3025 | # I2C system bus drivers (mostly embedded / system-on-chip) |
3024 | 3026 | # |
3025 | 3027 | CONFIG_I2C_CBUS_GPIO=m |
3026 | -CONFIG_I2C_DESIGNWARE_CORE=m | |
3027 | -CONFIG_I2C_DESIGNWARE_PLATFORM=m | |
3028 | +CONFIG_I2C_DESIGNWARE_CORE=y | |
3029 | +CONFIG_I2C_DESIGNWARE_PLATFORM=y | |
3028 | 3030 | CONFIG_I2C_DESIGNWARE_PCI=m |
3029 | 3031 | CONFIG_I2C_DESIGNWARE_BAYTRAIL=y |
3030 | 3032 | CONFIG_I2C_EMEV2=m |
@@ -3568,6 +3570,7 @@ CONFIG_MFD_CROS_EC_I2C=m | ||
3568 | 3570 | CONFIG_LPC_ICH=m |
3569 | 3571 | CONFIG_LPC_SCH=m |
3570 | 3572 | CONFIG_INTEL_SOC_PMIC=y |
3573 | +CONFIG_INTEL_SOC_PMIC_CHTWC=y | |
3571 | 3574 | CONFIG_MFD_INTEL_LPSS=m |
3572 | 3575 | CONFIG_MFD_INTEL_LPSS_ACPI=m |
3573 | 3576 | CONFIG_MFD_INTEL_LPSS_PCI=m |
@@ -5078,7 +5081,7 @@ CONFIG_I2C_HID=m | ||
5078 | 5081 | # |
5079 | 5082 | # Intel ISH HID support |
5080 | 5083 | # |
5081 | -# CONFIG_INTEL_ISH_HID is not set | |
5084 | +CONFIG_INTEL_ISH_HID=m | |
5082 | 5085 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
5083 | 5086 | CONFIG_USB_SUPPORT=y |
5084 | 5087 | CONFIG_USB_COMMON=y |
@@ -5605,9 +5608,10 @@ CONFIG_INTEL_IDMA64=m | ||
5605 | 5608 | CONFIG_INTEL_IOATDMA=m |
5606 | 5609 | # CONFIG_QCOM_HIDMA_MGMT is not set |
5607 | 5610 | # CONFIG_QCOM_HIDMA is not set |
5608 | -CONFIG_DW_DMAC_CORE=y | |
5611 | +CONFIG_DW_DMAC_CORE=m | |
5609 | 5612 | CONFIG_DW_DMAC=m |
5610 | -CONFIG_DW_DMAC_PCI=y | |
5613 | +CONFIG_DW_DMAC_PCI=m | |
5614 | +CONFIG_HSU_DMA=m | |
5611 | 5615 | |
5612 | 5616 | # |
5613 | 5617 | # DMA Clients |
@@ -5774,6 +5778,19 @@ CONFIG_STAGING_MEDIA=y | ||
5774 | 5778 | # CONFIG_MEDIA_CEC is not set |
5775 | 5779 | CONFIG_DVB_CXD2099=m |
5776 | 5780 | # CONFIG_LIRC_STAGING is not set |
5781 | +CONFIG_INTEL_ATOMISP=y | |
5782 | +CONFIG_VIDEO_ATOMISP=m | |
5783 | +CONFIG_VIDEO_OV5693=m | |
5784 | +CONFIG_VIDEO_IMX=m | |
5785 | +CONFIG_VIDEO_OV2722=m | |
5786 | +CONFIG_VIDEO_GC2235=m | |
5787 | +CONFIG_VIDEO_OV8858=m | |
5788 | +CONFIG_VIDEO_MSRLIST_HELPER=m | |
5789 | +CONFIG_VIDEO_MT9M114=m | |
5790 | +CONFIG_VIDEO_AP1302=m | |
5791 | +CONFIG_VIDEO_GC0310=m | |
5792 | +CONFIG_VIDEO_OV2680=m | |
5793 | +CONFIG_VIDEO_LM3554=m | |
5777 | 5794 | |
5778 | 5795 | # |
5779 | 5796 | # Android |
@@ -6871,6 +6888,7 @@ CONFIG_X86_DEBUG_FPU=y | ||
6871 | 6888 | # CONFIG_SECURITY_DMESG_RESTRICT is not set |
6872 | 6889 | CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y |
6873 | 6890 | CONFIG_SECURITY=y |
6891 | +CONFIG_PAGE_TABLE_ISOLATION=y | |
6874 | 6892 | # CONFIG_SECURITYFS is not set |
6875 | 6893 | CONFIG_SECURITY_NETWORK=y |
6876 | 6894 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
@@ -1,6 +1,6 @@ | ||
1 | 1 | # |
2 | 2 | # Automatically generated file; DO NOT EDIT. |
3 | -# Linux/x86 4.9.54 Kernel Configuration | |
3 | +# Linux/x86 4.9.80 Kernel Configuration | |
4 | 4 | # |
5 | 5 | # CONFIG_64BIT is not set |
6 | 6 | CONFIG_X86_32=y |
@@ -371,6 +371,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y | ||
371 | 371 | CONFIG_X86_MPPARSE=y |
372 | 372 | # CONFIG_X86_BIGSMP is not set |
373 | 373 | # CONFIG_GOLDFISH is not set |
374 | +CONFIG_RETPOLINE=y | |
374 | 375 | CONFIG_X86_EXTENDED_PLATFORM=y |
375 | 376 | # CONFIG_X86_GOLDFISH is not set |
376 | 377 | CONFIG_X86_INTEL_MID=y |
@@ -622,6 +623,7 @@ CONFIG_PMIC_OPREGION=y | ||
622 | 623 | CONFIG_CRC_PMIC_OPREGION=y |
623 | 624 | CONFIG_XPOWER_PMIC_OPREGION=y |
624 | 625 | CONFIG_BXT_WC_PMIC_OPREGION=y |
626 | +CONFIG_CHT_WC_PMIC_OPREGION=y | |
625 | 627 | # CONFIG_ACPI_CONFIGFS is not set |
626 | 628 | CONFIG_SFI=y |
627 | 629 | # CONFIG_APM is not set |
@@ -639,7 +641,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y | ||
639 | 641 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
640 | 642 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
641 | 643 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
642 | -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set | |
643 | 644 | # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set |
644 | 645 | # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set |
645 | 646 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
@@ -647,7 +648,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y | ||
647 | 648 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
648 | 649 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
649 | 650 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y |
650 | -# CONFIG_CPU_FREQ_GOV_SCHED is not set | |
651 | 651 | # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set |
652 | 652 | # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set |
653 | 653 |
@@ -1094,6 +1094,7 @@ CONFIG_STP=m | ||
1094 | 1094 | CONFIG_BRIDGE=m |
1095 | 1095 | CONFIG_BRIDGE_IGMP_SNOOPING=y |
1096 | 1096 | CONFIG_HAVE_NET_DSA=y |
1097 | +# CONFIG_NET_DSA is not set | |
1097 | 1098 | # CONFIG_VLAN_8021Q is not set |
1098 | 1099 | # CONFIG_DECNET is not set |
1099 | 1100 | CONFIG_LLC=m |
@@ -1336,6 +1337,7 @@ CONFIG_DEV_COREDUMP=y | ||
1336 | 1337 | # CONFIG_SYS_HYPERVISOR is not set |
1337 | 1338 | # CONFIG_GENERIC_CPU_DEVICES is not set |
1338 | 1339 | CONFIG_GENERIC_CPU_AUTOPROBE=y |
1340 | +CONFIG_GENERIC_CPU_VULNERABILITIES=y | |
1339 | 1341 | CONFIG_REGMAP=y |
1340 | 1342 | CONFIG_REGMAP_I2C=y |
1341 | 1343 | CONFIG_REGMAP_SPI=y |
@@ -2956,7 +2958,7 @@ CONFIG_DEVMEM=y | ||
2956 | 2958 | # |
2957 | 2959 | CONFIG_SERIAL_EARLYCON=y |
2958 | 2960 | CONFIG_SERIAL_8250=y |
2959 | -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y | |
2961 | +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set | |
2960 | 2962 | CONFIG_SERIAL_8250_PNP=y |
2961 | 2963 | # CONFIG_SERIAL_8250_FINTEK is not set |
2962 | 2964 | CONFIG_SERIAL_8250_CONSOLE=y |
@@ -2977,10 +2979,10 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
2977 | 2979 | CONFIG_SERIAL_8250_RSA=y |
2978 | 2980 | # CONFIG_SERIAL_8250_FSL is not set |
2979 | 2981 | CONFIG_SERIAL_8250_DW=m |
2980 | -# CONFIG_SERIAL_8250_RT288X is not set | |
2981 | -CONFIG_SERIAL_8250_LPSS=y | |
2982 | -# CONFIG_SERIAL_8250_MID is not set | |
2983 | -# CONFIG_SERIAL_8250_MOXA is not set | |
2982 | +CONFIG_SERIAL_8250_RT288X=y | |
2983 | +CONFIG_SERIAL_8250_LPSS=m | |
2984 | +CONFIG_SERIAL_8250_MID=m | |
2985 | +CONFIG_SERIAL_8250_MOXA=m | |
2984 | 2986 | # CONFIG_SERIAL_OF_PLATFORM is not set |
2985 | 2987 | |
2986 | 2988 | # |
@@ -3104,8 +3106,8 @@ CONFIG_I2C_SCMI=m | ||
3104 | 3106 | # I2C system bus drivers (mostly embedded / system-on-chip) |
3105 | 3107 | # |
3106 | 3108 | CONFIG_I2C_CBUS_GPIO=m |
3107 | -CONFIG_I2C_DESIGNWARE_CORE=m | |
3108 | -CONFIG_I2C_DESIGNWARE_PLATFORM=m | |
3109 | +CONFIG_I2C_DESIGNWARE_CORE=y | |
3110 | +CONFIG_I2C_DESIGNWARE_PLATFORM=y | |
3109 | 3111 | CONFIG_I2C_DESIGNWARE_PCI=m |
3110 | 3112 | CONFIG_I2C_DESIGNWARE_BAYTRAIL=y |
3111 | 3113 | CONFIG_I2C_EG20T=m |
@@ -3681,6 +3683,7 @@ CONFIG_MFD_CROS_EC_SPI=m | ||
3681 | 3683 | CONFIG_LPC_ICH=m |
3682 | 3684 | CONFIG_LPC_SCH=m |
3683 | 3685 | CONFIG_INTEL_SOC_PMIC=y |
3686 | +CONFIG_INTEL_SOC_PMIC_CHTWC=y | |
3684 | 3687 | CONFIG_MFD_INTEL_LPSS=m |
3685 | 3688 | CONFIG_MFD_INTEL_LPSS_ACPI=m |
3686 | 3689 | CONFIG_MFD_INTEL_LPSS_PCI=m |
@@ -5775,9 +5778,11 @@ CONFIG_INTEL_IDMA64=m | ||
5775 | 5778 | CONFIG_PCH_DMA=m |
5776 | 5779 | # CONFIG_QCOM_HIDMA_MGMT is not set |
5777 | 5780 | # CONFIG_QCOM_HIDMA is not set |
5778 | -CONFIG_DW_DMAC_CORE=y | |
5781 | +CONFIG_DW_DMAC_CORE=m | |
5779 | 5782 | CONFIG_DW_DMAC=m |
5780 | -CONFIG_DW_DMAC_PCI=y | |
5783 | +CONFIG_DW_DMAC_PCI=m | |
5784 | +CONFIG_HSU_DMA=m | |
5785 | +CONFIG_HSU_DMA_PCI=m | |
5781 | 5786 | |
5782 | 5787 | # |
5783 | 5788 | # DMA Clients |
@@ -5944,6 +5949,19 @@ CONFIG_STAGING_MEDIA=y | ||
5944 | 5949 | # CONFIG_MEDIA_CEC is not set |
5945 | 5950 | CONFIG_DVB_CXD2099=m |
5946 | 5951 | # CONFIG_LIRC_STAGING is not set |
5952 | +CONFIG_INTEL_ATOMISP=y | |
5953 | +CONFIG_VIDEO_ATOMISP=m | |
5954 | +CONFIG_VIDEO_OV5693=m | |
5955 | +CONFIG_VIDEO_IMX=m | |
5956 | +CONFIG_VIDEO_OV2722=m | |
5957 | +CONFIG_VIDEO_GC2235=m | |
5958 | +CONFIG_VIDEO_OV8858=m | |
5959 | +CONFIG_VIDEO_MSRLIST_HELPER=m | |
5960 | +CONFIG_VIDEO_MT9M114=m | |
5961 | +CONFIG_VIDEO_AP1302=m | |
5962 | +CONFIG_VIDEO_GC0310=m | |
5963 | +CONFIG_VIDEO_OV2680=m | |
5964 | +CONFIG_VIDEO_LM3554=m | |
5947 | 5965 | |
5948 | 5966 | # |
5949 | 5967 | # Android |