From f79da03296f2104dbe9d6af15594c7404c9f71fd Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 4 May 2019 22:40:59 +0100
Subject: [PATCH] drivers/firmware/google: Adjust configuration for 4.19

---
 debian/changelog     | 1 +
 debian/config/config | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fb3317006..5c7929743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1093,6 +1093,7 @@ linux (4.19.37-1) UNRELEASED; urgency=medium
   * ntfs: Disable NTFS_FS due to lack of upstream security support
     (CVE-2018-12929, CVE-2018-12930, CVE-2018-12931)
   * [x86] platform: Enable INTEL_ATOMISP2_PM as module
+  * drivers/firmware/google: Adjust configuration for 4.19
 
   [ YunQiang Su ]
   * [mips*r6] Re-enable CONFIG_JUMP_LABEL, which has been fixed in upstream.
diff --git a/debian/config/config b/debian/config/config
index ec09b3640..1800f186a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -605,7 +605,8 @@ CONFIG_EFI_CAPSULE_LOADER=m
 ## file: drivers/firmware/google/Kconfig
 ##
 CONFIG_GOOGLE_FIRMWARE=y
-CONFIG_GOOGLE_COREBOOT_TABLE=m
+CONFIG_GOOGLE_COREBOOT_TABLE_ACPI=m
+CONFIG_GOOGLE_COREBOOT_TABLE_OF=m
 CONFIG_GOOGLE_MEMCONSOLE_COREBOOT=m
 
 ##