commit 21d6a27ac07d5233a7dd473d84c4c0b541059146
author Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Nov 05 18:50:38 2019 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Sat Nov 09 11:03:03 2019 +0000
tree d926aa165ad61e40a4ebdc770a8cbc96fd23d24a
parent be5317f6d0084b1997ff7342fbf5a5af3eecd950

arch/x86: Replace some __SMM__ guards

We generally do not guard source in attempts to reduce
the final object sizes, but rely on garbage collection.

Most of the __unused attributes inserted here will be
removed when remaining __SIMPLE_DEVICE__ guards can
be removed.

Change-Id: I2440931fab4f41d7e8249c082e6c9b5a9cd0ef13
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36641
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/intel/baytrail/pmutil.c

diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c
index b740a03..51174fc 100644
--- a/src/soc/intel/baytrail/pmutil.c
+++ b/src/soc/intel/baytrail/pmutil.c
@@ -16,7 +16,9 @@
 #include <stdint.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <device/device.h>
 #include <device/mmio.h>
+#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>
@@ -37,10 +39,7 @@
 	return pcu_dev;
 }
 
-#else /* !__SMM__ */
-#include <device/device.h>
-#include <device/pci.h>
-
+#else
 static struct device *pcu_dev;
 static struct device *get_pcu_dev(void)
 {

src/soc/intel/braswell/pmutil.c

diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index 4bc621b..18cb04d 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -17,7 +17,9 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <assert.h>
+#include <device/device.h>
 #include <device/mmio.h>
+#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <soc/iomap.h>
@@ -37,9 +39,7 @@
 	return pcu_dev;
 }
 
-#else /* ENV_SMM */
-#include <device/device.h>
-#include <device/pci.h>
+#else /* __SIMPLE_DEVICE__ */
 
 static struct device *pcu_dev;
 static struct device *get_pcu_dev(void)
@@ -48,7 +48,7 @@
 		pcu_dev = pcidev_on_root(PCU_DEV, 0);
 	return pcu_dev;
 }
-#endif /* ENV_SMM */
+#endif /* __SIMPLE_DEVICE__ */
 
 uint16_t get_pmbase(void)
 {

src/soc/intel/broadwell/xhci.c

diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c
index 4779987..00b8b8c 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/xhci.c
@@ -24,7 +24,7 @@
 #include <soc/xhci.h>
 #include <soc/cpu.h>
 
-#ifdef __SMM__
+#ifdef __SIMPLE_DEVICE__
 static u8 *usb_xhci_mem_base(pci_devfn_t dev)
 {
 	u32 mem_base = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
@@ -196,7 +196,7 @@
 	pci_or_config16(dev, XHCI_PWR_CTL_STS, XHCI_PWR_CTL_STATUS_PME);
 	pci_or_config16(dev, XHCI_PWR_CTL_STS, XHCI_PWR_CTL_ENABLE_PME);
 }
-#else /* !__SMM__ */
+#else /* !__SIMPLE_DEVICE__ */
 
 static void xhci_init(struct device *dev)
 {
@@ -235,4 +235,4 @@
 	.vendor	 = PCI_VENDOR_ID_INTEL,
 	.devices = pci_device_ids,
 };
-#endif /* !__SMM__ */
+#endif /* !__SIMPLE_DEVICE__ */