CHROMIUM: config: Renormalization of config

normalized config with following command:
./chromeos/scripts/kernelconfig olddefconfig

BUG=b:137776724
TEST=emerge-mistral gw-kernel-4_14

Change-Id: I858750f97a3b289784febb5b28c98cbc197cd981
Reviewed-on: https://chromium-review.googlesource.com/1769378
Tested-by: Bhogeswara Rao Metta <bhogeswararao@google.com>
Commit-Ready: Bhogeswara Rao Metta <bhogeswararao@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Kan Yan <kyan@chromium.org>

7 files changed, 22 insertions, 1 deletions

diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
index ccb9b87535a4..6e91d3a40efd 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -305,6 +305,7 @@ CONFIG_LLC=m
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MALI_MIDGARD is not set
 # CONFIG_MDIO_THUNDER is not set
 # CONFIG_MDM_GCC_9615 is not set
@@ -576,6 +577,7 @@ CONFIG_QCOM_CLK_RPMH=y
 CONFIG_QCOM_COMMAND_DB=y
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_FASTRPC is not set
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_GLINK_SSR=m
@@ -585,6 +587,7 @@ CONFIG_QCOM_GLINK_SSR=m
 CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_PDC=y
+# CONFIG_QCOM_Q6V5_ADSP is not set
 CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_MSS=m
 # CONFIG_QCOM_Q6V5_PAS is not set
@@ -610,11 +613,13 @@ CONFIG_QCOM_SPMI_TEMP_ALARM=y
 # CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QCOM_SYSMON=m
 CONFIG_QCOM_TSENS=y
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
 CONFIG_QCOM_VADC_COMMON=y
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_WCNSS_PIL is not set
 # CONFIG_QCOM_WDT is not set
 CONFIG_QCS_GCC_404=y
+# CONFIG_QCS_TURING_404 is not set
 CONFIG_QCS_WCSSCC_404=y
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set
diff --git a/chromeos/config/arm64/chromiumos-mediatek.flavour.config b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
index e82bd653043d..440949382aae 100644
--- a/chromeos/config/arm64/chromiumos-mediatek.flavour.config
+++ b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
@@ -68,6 +68,7 @@ CONFIG_ION=y
 # CONFIG_LEDS_LP5562 is not set
 CONFIG_LLC=m
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MALI_DEVFREQ is not set
 # CONFIG_MALI_DMA_FENCE is not set
 # CONFIG_MALI_EXPERT is not set
@@ -123,6 +124,8 @@ CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PWM_MEDIATEK is not set
 CONFIG_PWM_MTK_DISP=y
 # CONFIG_QCOM_CPR is not set
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
+# CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_WCSSCC_404 is not set
 # CONFIG_RD_LZ4 is not set
 # CONFIG_RD_LZO is not set
diff --git a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
index f4a8b8052c7a..4fe66c4e94ba 100644
--- a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
+++ b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
@@ -543,7 +543,6 @@ CONFIG_QCOM_RPMH=y
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_64=y
-CONFIG_QCOM_TZ_USR_INTERFACE=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SDM845_LLCC=y
 CONFIG_QCOM_SMD_RPM=y
@@ -558,6 +557,7 @@ CONFIG_QCOM_SPMI_TEMP_ALARM=y
 # CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QCOM_SYSMON=y
 CONFIG_QCOM_TSENS=y
+CONFIG_QCOM_TZ_USR_INTERFACE=y
 CONFIG_QCOM_VADC_COMMON=y
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_WCNSS_PIL is not set
@@ -578,6 +578,7 @@ CONFIG_QRTR_TUN=y
 # CONFIG_R8822BE is not set
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZO=y
+CONFIG_REBOOT_MODE=y
 CONFIG_REGMAP_SPMI=y
 CONFIG_REGULATOR_FAN53555=y
 # CONFIG_REGULATOR_MAX8973 is not set
diff --git a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
index 22e4cd85b7a4..87a870108252 100644
--- a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
@@ -216,6 +216,7 @@ CONFIG_LLC=m
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MALI_MIDGARD is not set
 # CONFIG_MDIO_THUNDER is not set
 # CONFIG_MEDIA_PCI_SUPPORT is not set
@@ -354,6 +355,8 @@ CONFIG_PPS=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM_ROCKCHIP=y
 # CONFIG_QCOM_CPR is not set
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
+# CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_WCSSCC_404 is not set
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 4676edb7566b..4b90ebba4632 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -504,6 +504,7 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LIBFDT=y
 CONFIG_LLC=m
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MALI_MIDGARD is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCPM is not set
@@ -709,6 +710,8 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
+# CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_WCSSCC_404 is not set
 # CONFIG_QORIQ_CPUFREQ is not set
 # CONFIG_QORIQ_THERMAL is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 78653ced2d28..3029978c151a 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -670,6 +670,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_M586TSC is not set
 CONFIG_M686=y
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAILBOX is not set
@@ -958,6 +959,8 @@ CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_PWM is not set
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
+# CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_WCSSCC_404 is not set
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 2b5bf2672754..cb2c701d0227 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -794,6 +794,7 @@ CONFIG_LLC=m
 CONFIG_LPC_ICH=y
 CONFIG_LPC_SCH=y
 # CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_TX_LATENCY is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAILBOX=y
@@ -1094,6 +1095,8 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_TZ_USR_INTERFACE is not set
+# CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_WCSSCC_404 is not set
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set