Revert "CHROMIUM: config: Renormalization of config"

This reverts commit 54cb71bc54ef614a150259be531bebc53951b405.

BUG=b:137776724
TEST=None

Change-Id: Ic6a66e249c606fe2c32d840dc0d4412b2b5afc37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1765982
Reviewed-by: Julan Hsu <julanhsu@google.com>
Commit-Queue: Julan Hsu <julanhsu@google.com>
Tested-by: Julan Hsu <julanhsu@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>

9 files changed, 3 insertions, 41 deletions

diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
index 6601267dfaea..ccb9b87535a4 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -120,7 +120,6 @@ CONFIG_DEFAULT_USE_ENERGY_AWARE=y
 CONFIG_DEVPORT=y
 # CONFIG_DGNC is not set
 # CONFIG_DL2K is not set
-# CONFIG_DMA_CMA is not set
 # CONFIG_DRM_AMDGPU is not set
 CONFIG_DRM_ANALOGIX_ANX78XX=y
 # CONFIG_DRM_AST is not set
@@ -306,7 +305,6 @@ 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
@@ -578,7 +576,6 @@ 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
@@ -588,7 +585,6 @@ 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
@@ -614,13 +610,11 @@ 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 436c11e63303..e82bd653043d 100644
--- a/chromeos/config/arm64/chromiumos-mediatek.flavour.config
+++ b/chromeos/config/arm64/chromiumos-mediatek.flavour.config
@@ -31,7 +31,6 @@ CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_CPUFREQ_DT is not set
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 # CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
-# CONFIG_DMA_CMA is not set
 CONFIG_DRM_ANALOGIX_ANX78XX=y
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_MEDIATEK=y
@@ -69,7 +68,6 @@ 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
@@ -125,8 +123,6 @@ 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 11304f863e85..afaf762fd8b0 100644
--- a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
+++ b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config
@@ -107,12 +107,6 @@ CONFIG_BT_QCA=m
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHELSIO_T4 is not set
 # CONFIG_CHELSIO_T4VF is not set
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_SIZE_MBYTES=256
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CNIC is not set
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_COMMON_CLK_XGENE is not set
@@ -130,7 +124,6 @@ CONFIG_DEFAULT_USE_ENERGY_AWARE=y
 CONFIG_DEVPORT=y
 # CONFIG_DGNC is not set
 # CONFIG_DL2K is not set
-CONFIG_DMA_CMA=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
@@ -550,6 +543,7 @@ 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
@@ -564,7 +558,6 @@ 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
@@ -572,6 +565,8 @@ CONFIG_QCOM_WDT=y
 CONFIG_QCS_GCC_404=y
 CONFIG_QCS_TURING_404=y
 CONFIG_QCS_WCSSCC_404=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=256
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QLCNIC is not set
@@ -585,7 +580,6 @@ 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 15985f638978..22e4cd85b7a4 100644
--- a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
@@ -79,7 +79,6 @@ CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y
 CONFIG_DEVPORT=y
 # CONFIG_DGNC is not set
 # CONFIG_DL2K is not set
-# CONFIG_DMA_CMA is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 CONFIG_DRM_ANALOGIX_DP=y
@@ -217,7 +216,6 @@ 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
@@ -356,8 +354,6 @@ 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/arm64/common.config b/chromeos/config/arm64/common.config
index 514ace30f266..c5bd1e613669 100644
--- a/chromeos/config/arm64/common.config
+++ b/chromeos/config/arm64/common.config
@@ -22,7 +22,6 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HAS_ALT_SYSCALL=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 3aa91b2fb5ee..4676edb7566b 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -282,7 +282,6 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMATEST is not set
-# CONFIG_DMA_CMA is not set
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
 # CONFIG_DPOT_DAC is not set
@@ -505,7 +504,6 @@ 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
@@ -711,8 +709,6 @@ 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/base.config b/chromeos/config/base.config
index 5f70f3f9b50e..8e0df86dd4bc 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -309,9 +309,6 @@ CONFIG_CLS_U32_MARK=y
 # CONFIG_CM3323 is not set
 # CONFIG_CM36651 is not set
 CONFIG_CMA=y
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMDLINE_PARTITION is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_COMEDI is not set
@@ -1411,7 +1408,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_MEMBARRIER=y
 # CONFIG_MEMCG is not set
-CONFIG_MEMORY_ISOLATION=y
 # CONFIG_MEMORY_STATE_TIME is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MEMTEST is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 45e4018a714d..78653ced2d28 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -286,7 +286,6 @@ CONFIG_DEVPORT=y
 # CONFIG_DGNC is not set
 # CONFIG_DL2K is not set
 # CONFIG_DMADEVICES is not set
-# CONFIG_DMA_CMA is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
@@ -671,7 +670,6 @@ 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
@@ -960,8 +958,6 @@ 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 d7f00fd469ca..2b5bf2672754 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -96,7 +96,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_ARCH_HAS_PMEM_API=y
@@ -357,7 +356,6 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMARD06 is not set
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ACPI=y
-# CONFIG_DMA_CMA is not set
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
 CONFIG_DMI=y
@@ -796,7 +794,6 @@ 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
@@ -1097,8 +1094,6 @@ 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