diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-11-05 18:50:38 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-11-09 11:03:03 +0000 |
| commit | 21d6a27ac07d5233a7dd473d84c4c0b541059146 (patch) | |
| tree | d926aa165ad61e40a4ebdc770a8cbc96fd23d24a /src/soc | |
| parent | be5317f6d0084b1997ff7342fbf5a5af3eecd950 (diff) | |
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>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/baytrail/pmutil.c | 7 | ||||
| -rw-r--r-- | src/soc/intel/braswell/pmutil.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/xhci.c | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index b740a03818..51174fc130 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 @@ static inline pci_devfn_t get_pcu_dev(void) 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) { diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 4bc621b80e..18cb04dd89 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 @@ static inline pci_devfn_t get_pcu_dev(void) 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 @@ static struct device *get_pcu_dev(void) pcu_dev = pcidev_on_root(PCU_DEV, 0); return pcu_dev; } -#endif /* ENV_SMM */ +#endif /* __SIMPLE_DEVICE__ */ uint16_t get_pmbase(void) { diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c index 477998731d..00b8b8ca87 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 @@ void usb_xhci_sleep_prepare(pci_devfn_t dev, u8 slp_typ) 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 @@ static const struct pci_driver pch_usb_xhci __pci_driver = { .vendor = PCI_VENDOR_ID_INTEL, .devices = pci_device_ids, }; -#endif /* !__SMM__ */ +#endif /* !__SIMPLE_DEVICE__ */ |