summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-12 14:18:50 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-12 21:56:30 +0100
commit318066fbc1c53d0686bde6626a406c039ec0b8f3 (patch)
tree51b8e525b29fabf76d62b82390ed224519aa1ee9
parent8cde852ecf4dced16b342a2da31990e0caf8b92b (diff)
downloadcoreboot-318066fbc1c53d0686bde6626a406c039ec0b8f3.tar.xz
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>
-rw-r--r--src/device/device.c2
-rw-r--r--src/device/device_util.c2
-rw-r--r--src/include/device/pci.h5
3 files changed, 7 insertions, 2 deletions
diff --git a/src/device/device.c b/src/device/device.c
index 9e068107d8..e068cee044 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -35,7 +35,7 @@
#include <console/console.h>
#include <arch/io.h>
#include <device/device.h>
-#include <device/pci.h>
+#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/device/device_util.c b/src/device/device_util.c
index dc43b9a656..2bed4a9585 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -25,7 +25,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
-#include <device/pci.h>
+#include <device/pci_def.h>
#include <device/resource.h>
#include <string.h>
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 1741c0d1e9..7504cc7269 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -15,6 +15,8 @@
#ifndef PCI_H
#define PCI_H
+#if CONFIG_PCI
+
#include <stdint.h>
#include <stddef.h>
#include <arch/rules.h>
@@ -98,4 +100,7 @@ static inline const struct pci_operations *ops_pci(device_t dev)
}
#endif /* ! __SIMPLE_DEVICE__ */
+
+#endif /* CONFIG_PCI */
+
#endif /* PCI_H */