From 9cd65cd4b523123033be2cbd99581764015af4ce Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Thu, 9 Aug 2018 10:08:34 -0700
Subject: soc/intel/apollolake: Get rid of cnvi.asl

There is no need to add a special cnvi.asl file for the CNVi
device. This can be handled by drivers/intel/wifi just like a PCIe
WiFi device. This change gets rid of the cnvi.asl file and its usage
in southbridge.asl file.

BUG=b:112371978

Change-Id: I0b798cdd430768730b7ada61ca4cb1f63c2a4229
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/27992
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/soc/intel/apollolake/acpi/southbridge.asl | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/soc/intel/apollolake/acpi/southbridge.asl')

diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl
index 9f14db48b4..799778bc3c 100644
--- a/src/soc/intel/apollolake/acpi/southbridge.asl
+++ b/src/soc/intel/apollolake/acpi/southbridge.asl
@@ -47,10 +47,4 @@
 /* SGX */
 #if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_SGX)
 #include <soc/intel/common/acpi/sgx.asl>
-
-/* CNVi */
-#if IS_ENABLED(CONFIG_SOC_INTEL_GLK)
-#include "cnvi.asl"
-#endif
-
 #endif
-- 
cgit v1.2.3