GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

southbridge/intel/common/spi.c: Define __SIMPLE_DEVICE__ 

This simplifies PCI config space accessors.

Change-Id: Idf0f90ee2dc1dcb0003ef5d56eff44ca9a5634e7
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37079
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans 2019-11-21 08:24:02 +01:00 committed by Patrick Georgi
parent 47a6603f34
commit 026863b2ff
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/southbridge/intel/common/spi.c
View File

@ -15,6 +15,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#define __SIMPLE_DEVICE__
/* This file is derived from the flashrom project. */ /* This file is derived from the flashrom project. */
#include <arch/early_variables.h> #include <arch/early_variables.h>
#include <stdint.h> #include <stdint.h>
@ -274,11 +276,7 @@ static void ich_set_bbar(uint32_t minaddr)
#define RCBA 0xf0 #define RCBA 0xf0
#define SBASE 0x54 #define SBASE 0x54
#ifdef __SIMPLE_DEVICE__
static void *get_spi_bar(pci_devfn_t dev) static void *get_spi_bar(pci_devfn_t dev)
#else
static void *get_spi_bar(struct device *dev)
#endif
{ {
uintptr_t rcba; /* Root Complex Register Block */ uintptr_t rcba; /* Root Complex Register Block */
uintptr_t sbase; uintptr_t sbase;
@ -306,11 +304,7 @@ void spi_init(void)
struct ich7_spi_regs *ich7_spi; struct ich7_spi_regs *ich7_spi;
uint16_t hsfs; uint16_t hsfs;
#ifdef __SIMPLE_DEVICE__
pci_devfn_t dev = PCI_DEV(0, 31, 0); pci_devfn_t dev = PCI_DEV(0, 31, 0);
#else
struct device *dev = pcidev_on_root(31, 0);
#endif
if (CONFIG(SOUTHBRIDGE_INTEL_I82801GX)) { if (CONFIG(SOUTHBRIDGE_INTEL_I82801GX)) {
ich7_spi = get_spi_bar(dev); ich7_spi = get_spi_bar(dev);