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

PCI: Guard pci.h with CONFIG_PCI 

Adding PCI functions for romstage in pci.h breaks ARMv7 build without
this. Also fix two related includes to use pci_def.h instead.

Change-Id: I5291eaf6ddf5a584f50af29cf791d2ca4d9caa71
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5199
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki 2014-02-12 14:18:50 +02:00
parent 8cde852ecf
commit 318066fbc1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/device.c
View File

@ -35,7 +35,7 @@
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci_def.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/device/device_util.c
View File

@ -25,7 +25,7 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/path.h> #include <device/path.h>
#include <device/pci.h> #include <device/pci_def.h>
#include <device/resource.h> #include <device/resource.h>
#include <string.h> #include <string.h>

5
src/include/device/pci.h
View File

@ -15,6 +15,8 @@
#ifndef PCI_H #ifndef PCI_H
#define PCI_H #define PCI_H
#if CONFIG_PCI
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <arch/rules.h> #include <arch/rules.h>
@ -98,4 +100,7 @@ static inline const struct pci_operations *ops_pci(device_t dev)
} }
#endif /* ! __SIMPLE_DEVICE__ */ #endif /* ! __SIMPLE_DEVICE__ */
#endif /* CONFIG_PCI */
#endif /* PCI_H */ #endif /* PCI_H */