• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

kernel


Commit MetaInfo

Revisiona31e11bc400d5f144b4e7de8495549d718e771ed (tree)
Time2018-02-06 01:00:47
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android-x86: update defconfig for the 7.1-r1 release

Change Summary

Incremental Difference

--- a/arch/x86/configs/android-x86_64_defconfig
+++ b/arch/x86/configs/android-x86_64_defconfig
@@ -1,6 +1,6 @@
11 #
22 # Automatically generated file; DO NOT EDIT.
3-# Linux/x86_64 4.9.54 Kernel Configuration
3+# Linux/x86_64 4.9.80 Kernel Configuration
44 #
55 CONFIG_64BIT=y
66 CONFIG_X86_64=y
@@ -388,6 +388,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
388388 # CONFIG_X86_X2APIC is not set
389389 CONFIG_X86_MPPARSE=y
390390 # CONFIG_GOLDFISH is not set
391+CONFIG_RETPOLINE=y
391392 CONFIG_X86_EXTENDED_PLATFORM=y
392393 # CONFIG_X86_VSMP is not set
393394 # CONFIG_X86_GOLDFISH is not set
@@ -624,6 +625,7 @@ CONFIG_PMIC_OPREGION=y
624625 CONFIG_CRC_PMIC_OPREGION=y
625626 CONFIG_XPOWER_PMIC_OPREGION=y
626627 CONFIG_BXT_WC_PMIC_OPREGION=y
628+CONFIG_CHT_WC_PMIC_OPREGION=y
627629 # CONFIG_ACPI_CONFIGFS is not set
628630 CONFIG_SFI=y
629631
@@ -640,7 +642,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
640642 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
641643 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
642644 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
643-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
644645 # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
645646 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
646647 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -648,7 +649,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
648649 CONFIG_CPU_FREQ_GOV_USERSPACE=y
649650 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
650651 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
651-# CONFIG_CPU_FREQ_GOV_SCHED is not set
652652 # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
653653 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
654654
@@ -1075,6 +1075,7 @@ CONFIG_STP=m
10751075 CONFIG_BRIDGE=m
10761076 CONFIG_BRIDGE_IGMP_SNOOPING=y
10771077 CONFIG_HAVE_NET_DSA=y
1078+# CONFIG_NET_DSA is not set
10781079 # CONFIG_VLAN_8021Q is not set
10791080 # CONFIG_DECNET is not set
10801081 CONFIG_LLC=m
@@ -1319,6 +1320,7 @@ CONFIG_DEV_COREDUMP=y
13191320 # CONFIG_SYS_HYPERVISOR is not set
13201321 # CONFIG_GENERIC_CPU_DEVICES is not set
13211322 CONFIG_GENERIC_CPU_AUTOPROBE=y
1323+CONFIG_GENERIC_CPU_VULNERABILITIES=y
13221324 CONFIG_REGMAP=y
13231325 CONFIG_REGMAP_I2C=y
13241326 CONFIG_REGMAP_SPI=y
@@ -2888,7 +2890,7 @@ CONFIG_DEVMEM=y
28882890 #
28892891 CONFIG_SERIAL_EARLYCON=y
28902892 CONFIG_SERIAL_8250=y
2891-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
2893+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
28922894 CONFIG_SERIAL_8250_PNP=y
28932895 # CONFIG_SERIAL_8250_FINTEK is not set
28942896 CONFIG_SERIAL_8250_CONSOLE=y
@@ -2904,10 +2906,10 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
29042906 CONFIG_SERIAL_8250_RSA=y
29052907 # CONFIG_SERIAL_8250_FSL is not set
29062908 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
29112913 # CONFIG_SERIAL_OF_PLATFORM is not set
29122914
29132915 #
@@ -3023,8 +3025,8 @@ CONFIG_I2C_SCMI=m
30233025 # I2C system bus drivers (mostly embedded / system-on-chip)
30243026 #
30253027 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
30283030 CONFIG_I2C_DESIGNWARE_PCI=m
30293031 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
30303032 CONFIG_I2C_EMEV2=m
@@ -3568,6 +3570,7 @@ CONFIG_MFD_CROS_EC_I2C=m
35683570 CONFIG_LPC_ICH=m
35693571 CONFIG_LPC_SCH=m
35703572 CONFIG_INTEL_SOC_PMIC=y
3573+CONFIG_INTEL_SOC_PMIC_CHTWC=y
35713574 CONFIG_MFD_INTEL_LPSS=m
35723575 CONFIG_MFD_INTEL_LPSS_ACPI=m
35733576 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -5078,7 +5081,7 @@ CONFIG_I2C_HID=m
50785081 #
50795082 # Intel ISH HID support
50805083 #
5081-# CONFIG_INTEL_ISH_HID is not set
5084+CONFIG_INTEL_ISH_HID=m
50825085 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
50835086 CONFIG_USB_SUPPORT=y
50845087 CONFIG_USB_COMMON=y
@@ -5605,9 +5608,10 @@ CONFIG_INTEL_IDMA64=m
56055608 CONFIG_INTEL_IOATDMA=m
56065609 # CONFIG_QCOM_HIDMA_MGMT is not set
56075610 # CONFIG_QCOM_HIDMA is not set
5608-CONFIG_DW_DMAC_CORE=y
5611+CONFIG_DW_DMAC_CORE=m
56095612 CONFIG_DW_DMAC=m
5610-CONFIG_DW_DMAC_PCI=y
5613+CONFIG_DW_DMAC_PCI=m
5614+CONFIG_HSU_DMA=m
56115615
56125616 #
56135617 # DMA Clients
@@ -5774,6 +5778,19 @@ CONFIG_STAGING_MEDIA=y
57745778 # CONFIG_MEDIA_CEC is not set
57755779 CONFIG_DVB_CXD2099=m
57765780 # 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
57775794
57785795 #
57795796 # Android
@@ -6871,6 +6888,7 @@ CONFIG_X86_DEBUG_FPU=y
68716888 # CONFIG_SECURITY_DMESG_RESTRICT is not set
68726889 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
68736890 CONFIG_SECURITY=y
6891+CONFIG_PAGE_TABLE_ISOLATION=y
68746892 # CONFIG_SECURITYFS is not set
68756893 CONFIG_SECURITY_NETWORK=y
68766894 # CONFIG_SECURITY_NETWORK_XFRM is not set
--- a/arch/x86/configs/android-x86_defconfig
+++ b/arch/x86/configs/android-x86_defconfig
@@ -1,6 +1,6 @@
11 #
22 # Automatically generated file; DO NOT EDIT.
3-# Linux/x86 4.9.54 Kernel Configuration
3+# Linux/x86 4.9.80 Kernel Configuration
44 #
55 # CONFIG_64BIT is not set
66 CONFIG_X86_32=y
@@ -371,6 +371,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
371371 CONFIG_X86_MPPARSE=y
372372 # CONFIG_X86_BIGSMP is not set
373373 # CONFIG_GOLDFISH is not set
374+CONFIG_RETPOLINE=y
374375 CONFIG_X86_EXTENDED_PLATFORM=y
375376 # CONFIG_X86_GOLDFISH is not set
376377 CONFIG_X86_INTEL_MID=y
@@ -622,6 +623,7 @@ CONFIG_PMIC_OPREGION=y
622623 CONFIG_CRC_PMIC_OPREGION=y
623624 CONFIG_XPOWER_PMIC_OPREGION=y
624625 CONFIG_BXT_WC_PMIC_OPREGION=y
626+CONFIG_CHT_WC_PMIC_OPREGION=y
625627 # CONFIG_ACPI_CONFIGFS is not set
626628 CONFIG_SFI=y
627629 # CONFIG_APM is not set
@@ -639,7 +641,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
639641 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
640642 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
641643 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
642-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
643644 # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
644645 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
645646 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -647,7 +648,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
647648 CONFIG_CPU_FREQ_GOV_USERSPACE=y
648649 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
649650 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
650-# CONFIG_CPU_FREQ_GOV_SCHED is not set
651651 # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
652652 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
653653
@@ -1094,6 +1094,7 @@ CONFIG_STP=m
10941094 CONFIG_BRIDGE=m
10951095 CONFIG_BRIDGE_IGMP_SNOOPING=y
10961096 CONFIG_HAVE_NET_DSA=y
1097+# CONFIG_NET_DSA is not set
10971098 # CONFIG_VLAN_8021Q is not set
10981099 # CONFIG_DECNET is not set
10991100 CONFIG_LLC=m
@@ -1336,6 +1337,7 @@ CONFIG_DEV_COREDUMP=y
13361337 # CONFIG_SYS_HYPERVISOR is not set
13371338 # CONFIG_GENERIC_CPU_DEVICES is not set
13381339 CONFIG_GENERIC_CPU_AUTOPROBE=y
1340+CONFIG_GENERIC_CPU_VULNERABILITIES=y
13391341 CONFIG_REGMAP=y
13401342 CONFIG_REGMAP_I2C=y
13411343 CONFIG_REGMAP_SPI=y
@@ -2956,7 +2958,7 @@ CONFIG_DEVMEM=y
29562958 #
29572959 CONFIG_SERIAL_EARLYCON=y
29582960 CONFIG_SERIAL_8250=y
2959-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
2961+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
29602962 CONFIG_SERIAL_8250_PNP=y
29612963 # CONFIG_SERIAL_8250_FINTEK is not set
29622964 CONFIG_SERIAL_8250_CONSOLE=y
@@ -2977,10 +2979,10 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
29772979 CONFIG_SERIAL_8250_RSA=y
29782980 # CONFIG_SERIAL_8250_FSL is not set
29792981 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
29842986 # CONFIG_SERIAL_OF_PLATFORM is not set
29852987
29862988 #
@@ -3104,8 +3106,8 @@ CONFIG_I2C_SCMI=m
31043106 # I2C system bus drivers (mostly embedded / system-on-chip)
31053107 #
31063108 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
31093111 CONFIG_I2C_DESIGNWARE_PCI=m
31103112 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
31113113 CONFIG_I2C_EG20T=m
@@ -3681,6 +3683,7 @@ CONFIG_MFD_CROS_EC_SPI=m
36813683 CONFIG_LPC_ICH=m
36823684 CONFIG_LPC_SCH=m
36833685 CONFIG_INTEL_SOC_PMIC=y
3686+CONFIG_INTEL_SOC_PMIC_CHTWC=y
36843687 CONFIG_MFD_INTEL_LPSS=m
36853688 CONFIG_MFD_INTEL_LPSS_ACPI=m
36863689 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -5775,9 +5778,11 @@ CONFIG_INTEL_IDMA64=m
57755778 CONFIG_PCH_DMA=m
57765779 # CONFIG_QCOM_HIDMA_MGMT is not set
57775780 # CONFIG_QCOM_HIDMA is not set
5778-CONFIG_DW_DMAC_CORE=y
5781+CONFIG_DW_DMAC_CORE=m
57795782 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
57815786
57825787 #
57835788 # DMA Clients
@@ -5944,6 +5949,19 @@ CONFIG_STAGING_MEDIA=y
59445949 # CONFIG_MEDIA_CEC is not set
59455950 CONFIG_DVB_CXD2099=m
59465951 # 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
59475965
59485966 #
59495967 # Android