mainline: fold fix for GKI media config into original patch
Change-Id: I02c8e0dc797e9426c59e2a92bda501d652f64cf0
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
diff --git a/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch b/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
index 31a6a58..9a64968 100644
--- a/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
+++ b/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
@@ -29,7 +29,7 @@
create mode 100644 drivers/cpufreq/dummy-cpufreq.c
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
-index 10f8ca213484..74858518d011 100644
+index 8e6a20e0b64d..0933c134a2d0 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -61,6 +61,7 @@ CONFIG_CPU_FREQ_TIMES=y
@@ -41,7 +41,7 @@
CONFIG_ARM_SCMI_CPUFREQ=y
CONFIG_ARM_SCMI_PROTOCOL=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
-index 306ad5331a48..ba629336a4f2 100644
+index 46ec1d98f998..277b0069671e 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -46,6 +46,7 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
diff --git a/android-mainline/ANDROID-fix-VIDEOBUF2_CORE-dependency-in-allmodconfig-builds.patch b/android-mainline/ANDROID-fix-VIDEOBUF2_CORE-dependency-in-allmodconfig-builds.patch
deleted file mode 100644
index 8ed65a2..0000000
--- a/android-mainline/ANDROID-fix-VIDEOBUF2_CORE-dependency-in-allmodconfig-builds.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Todd Kjos <tkjos@google.com>
-Date: Mon, 28 Oct 2019 09:44:36 -0700
-Subject: ANDROID: fix VIDEOBUF2_CORE dependency in 'allmodconfig' builds
-
-Fix missing dependency for CONFIG_VIDEOBUF2_CORE for
-'allmodconfig' builds. Since CONFIG_MEDIA_SUPPORT is
-always selected, drop it from gki_defconfig
-
-Fixes: 649238947d688 ("ANDROID: init: GKI: enable hidden configs
-for media")
-
-Test: successful 'allmodconfig' build
-Change-Id: I1dd5ff154c1aeb90457c23dc233cb32595bd9bed
-Signed-off-by: Todd Kjos <tkjos@google.com>
----
- arch/arm64/configs/gki_defconfig | 1 -
- arch/x86/configs/gki_defconfig | 1 -
- init/Kconfig.gki | 1 +
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
-index 74858518d011..0933c134a2d0 100644
---- a/arch/arm64/configs/gki_defconfig
-+++ b/arch/arm64/configs/gki_defconfig
-@@ -298,7 +298,6 @@ CONFIG_WATCHDOG=y
- CONFIG_MFD_ACT8945A=y
- CONFIG_MFD_SYSCON=y
- CONFIG_REGULATOR=y
--CONFIG_MEDIA_SUPPORT=y
- CONFIG_MEDIA_CAMERA_SUPPORT=y
- CONFIG_MEDIA_CONTROLLER=y
- # CONFIG_VGA_ARB is not set
-diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
-index ba629336a4f2..277b0069671e 100644
---- a/arch/x86/configs/gki_defconfig
-+++ b/arch/x86/configs/gki_defconfig
-@@ -257,7 +257,6 @@ CONFIG_GPIOLIB=y
- CONFIG_DEVFREQ_THERMAL=y
- # CONFIG_X86_PKG_TEMP_THERMAL is not set
- CONFIG_REGULATOR=y
--CONFIG_MEDIA_SUPPORT=y
- CONFIG_MEDIA_CAMERA_SUPPORT=y
- CONFIG_DRM=y
- # CONFIG_DRM_FBDEV_EMULATION is not set
-diff --git a/init/Kconfig.gki b/init/Kconfig.gki
-index c9505a791280..c5a080e7784b 100644
---- a/init/Kconfig.gki
-+++ b/init/Kconfig.gki
-@@ -56,6 +56,7 @@ config GKI_HIDDEN_QCOM_CONFIGS
- config GKI_HIDDEN_MEDIA_CONFIGS
- bool "Hidden Media configs needed for GKI"
- select VIDEOBUF2_CORE
-+ select MEDIA_SUPPORT
- help
- Dummy config option used to enable hidden media configs.
- These are normally selected implicitely when a module
diff --git a/android-mainline/ANDROID-init-GKI-enable-hidden-configs-for-media.patch b/android-mainline/ANDROID-init-GKI-enable-hidden-configs-for-media.patch
index f04b7b9..bdc7c38 100644
--- a/android-mainline/ANDROID-init-GKI-enable-hidden-configs-for-media.patch
+++ b/android-mainline/ANDROID-init-GKI-enable-hidden-configs-for-media.patch
@@ -10,21 +10,51 @@
Test: Built for arm64/x86_64. Boot on cuttlefish
Change-Id: I137a89f69822332324a1f4a3a1150be9cd66709d
Signed-off-by: Todd Kjos <tkjos@google.com>
+[maennich: Folded c387eb07b04c ("ANDROID: fix VIDEOBUF2_CORE dependency
+ in 'allmodconfig' builds") into this patch]
+Signed-off-by: Matthias Maennich <maennich@google.com>
---
- init/Kconfig.gki | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ arch/arm64/configs/gki_defconfig | 1 -
+ arch/x86/configs/gki_defconfig | 1 -
+ init/Kconfig.gki | 9 +++++++++
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
+index 10f8ca213484..8e6a20e0b64d 100644
+--- a/arch/arm64/configs/gki_defconfig
++++ b/arch/arm64/configs/gki_defconfig
+@@ -297,7 +297,6 @@ CONFIG_WATCHDOG=y
+ CONFIG_MFD_ACT8945A=y
+ CONFIG_MFD_SYSCON=y
+ CONFIG_REGULATOR=y
+-CONFIG_MEDIA_SUPPORT=y
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
+ CONFIG_MEDIA_CONTROLLER=y
+ # CONFIG_VGA_ARB is not set
+diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
+index 306ad5331a48..46ec1d98f998 100644
+--- a/arch/x86/configs/gki_defconfig
++++ b/arch/x86/configs/gki_defconfig
+@@ -256,7 +256,6 @@ CONFIG_GPIOLIB=y
+ CONFIG_DEVFREQ_THERMAL=y
+ # CONFIG_X86_PKG_TEMP_THERMAL is not set
+ CONFIG_REGULATOR=y
+-CONFIG_MEDIA_SUPPORT=y
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
+ CONFIG_DRM=y
+ # CONFIG_DRM_FBDEV_EMULATION is not set
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
-index 4db995c2fe92..c9505a791280 100644
+index 4db995c2fe92..c5a080e7784b 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
-@@ -53,6 +53,13 @@ config GKI_HIDDEN_QCOM_CONFIGS
+@@ -53,6 +53,14 @@ config GKI_HIDDEN_QCOM_CONFIGS
These are normally selected implicitely when a module
that relies on it is configured.
+config GKI_HIDDEN_MEDIA_CONFIGS
+ bool "Hidden Media configs needed for GKI"
+ select VIDEOBUF2_CORE
++ select MEDIA_SUPPORT
+ help
+ Dummy config option used to enable hidden media configs.
+ These are normally selected implicitely when a module
@@ -32,7 +62,7 @@
# LEGACY_WEXT_ALLCONFIG Discussed upstream, soundly rejected as a unique
# problem for GKI to solve. It should be noted that these extensions are
-@@ -89,6 +96,7 @@ config GKI_HACKS_TO_FIX
+@@ -89,6 +97,7 @@ config GKI_HACKS_TO_FIX
select GKI_HIDDEN_GPIO_CONFIGS
select GKI_HIDDEN_QCOM_CONFIGS
select GKI_LEGACY_WEXT_ALLCONFIG
diff --git a/android-mainline/series b/android-mainline/series
index 0af8617..1461f5e 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -199,7 +199,6 @@
ANDROID-Allow-DRM_IOCTL_MODE_-_DUMB-for-render-clients.patch
ANDROID-virt_wifi-Add-data-ops-for-scan-data-simulation.patch
ANDROID-add-README.md.patch
-ANDROID-fix-VIDEOBUF2_CORE-dependency-in-allmodconfig-builds.patch
ANDROID-create-build.configs-for-allmodconfig.patch
ANDROID-gki_defconfig-enable-CONFIG_CPU_FREQ_GOV_CONSERVATIVE.patch
ANDROID-virtio-virtio_input-Set-the-amount-of-multitouch-slots-in-virtio-input.patch
