From 16433c9c9295e90a3e18c75e42bdb80a059df3b3 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 12 Nov 2020 14:48:54 +0100 Subject: soc/amd: factor out _SOC_DEV macro into common block TEST=Timeless build doesn't change for Mandolin and Gardenia. Change-Id: I1aef68459569536207697bfca407145a7b5334f4 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/47515 Tested-by: build bot (Jenkins) Reviewed-by: Jeremy Soller Reviewed-by: Martin Roth Reviewed-by: Jason Glenesk Reviewed-by: Marshall Dawson --- src/soc/amd/common/block/include/amdblocks/pci_devs.h | 15 +++++++++++++++ src/soc/amd/picasso/include/soc/pci_devs.h | 8 +------- src/soc/amd/stoneyridge/include/soc/pci_devs.h | 8 +------- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/soc/amd/common/block/include/amdblocks/pci_devs.h diff --git a/src/soc/amd/common/block/include/amdblocks/pci_devs.h b/src/soc/amd/common/block/include/amdblocks/pci_devs.h new file mode 100644 index 0000000000..8a38ac15d7 --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/pci_devs.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __AMD_BLOCK_PCI_DEVS_H__ +#define __AMD_BLOCK_PCI_DEVS_H__ + +#include + +#if !defined(__SIMPLE_DEVICE__) +#include +#define _SOC_DEV(slot, func) pcidev_on_root(slot, func) +#else +#define _SOC_DEV(slot, func) PCI_DEV(0, slot, func) +#endif + +#endif /* __AMD_BLOCK_PCI_DEVS_H__ */ diff --git a/src/soc/amd/picasso/include/soc/pci_devs.h b/src/soc/amd/picasso/include/soc/pci_devs.h index 27334f1462..83c0bcc7e3 100644 --- a/src/soc/amd/picasso/include/soc/pci_devs.h +++ b/src/soc/amd/picasso/include/soc/pci_devs.h @@ -4,13 +4,7 @@ #define __PI_PICASSO_PCI_DEVS_H__ #include - -#if !defined(__SIMPLE_DEVICE__) -#include -#define _SOC_DEV(slot, func) pcidev_on_root(slot, func) -#else -#define _SOC_DEV(slot, func) PCI_DEV(0, slot, func) -#endif +#include /* GNB Root Complex */ #define GNB_DEV 0x0 diff --git a/src/soc/amd/stoneyridge/include/soc/pci_devs.h b/src/soc/amd/stoneyridge/include/soc/pci_devs.h index 316f532d0e..03a12336f7 100644 --- a/src/soc/amd/stoneyridge/include/soc/pci_devs.h +++ b/src/soc/amd/stoneyridge/include/soc/pci_devs.h @@ -4,13 +4,7 @@ #define __PI_STONEYRIDGE_PCI_DEVS_H__ #include - -#if !defined(__SIMPLE_DEVICE__) -#include -#define _SOC_DEV(slot, func) pcidev_on_root(slot, func) -#else -#define _SOC_DEV(slot, func) PCI_DEV(0, slot, func) -#endif +#include /* GNB Root Complex */ #define GNB_DEV 0x0 -- cgit v1.2.3