diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 6e3bde4bb9..4f5029e5ac 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -88,7 +88,7 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
 		gnvs->scdo = gpio_acpi_pin(cfg->sdcard_cd_gpio);
 	}
 
-	if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX))
+	if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
 		sgx_fill_gnvs(gnvs);
 
 	/* Fill in Above 4GB MMIO resource */
diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl
index f4d1497223..f857bb97a0 100644
--- a/src/soc/intel/apollolake/acpi/southbridge.asl
+++ b/src/soc/intel/apollolake/acpi/southbridge.asl
@@ -30,6 +30,4 @@
 #include <soc/intel/common/acpi/pci_osc.asl>
 
 /* SGX */
-#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX)
 #include <soc/intel/common/acpi/sgx.asl>
-#endif
diff --git a/src/soc/intel/common/acpi/sgx.asl b/src/soc/intel/common/acpi/sgx.asl
index c0b8040729..9aea7a8b09 100644
--- a/src/soc/intel/common/acpi/sgx.asl
+++ b/src/soc/intel/common/acpi/sgx.asl
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE)
 Scope(\_SB)
 {
 	// Secure Enclave memory
@@ -54,3 +55,4 @@ Scope(\_SB)
 
 	} // end EPC Device
 } // End of Scope(\_SB)
+#endif
diff --git a/src/soc/intel/common/block/sgx/Makefile.inc b/src/soc/intel/common/block/sgx/Makefile.inc
index 3fa18d8873..ce3c436141 100644
--- a/src/soc/intel/common/block/sgx/Makefile.inc
+++ b/src/soc/intel/common/block/sgx/Makefile.inc
@@ -1 +1 @@
-ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_SGX) += sgx.c
+ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE) += sgx.c
diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl
index e088ca1782..0aa8f95761 100644
--- a/src/soc/intel/skylake/acpi/pch.asl
+++ b/src/soc/intel/skylake/acpi/pch.asl
@@ -62,6 +62,4 @@ Method (_OSC, 4)
 }
 
 /* SGX */
-#if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX)
 #include <soc/intel/common/acpi/sgx.asl>
-#endif