summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-09-17 17:00:08 -0400
committerTom Rini <trini@konsulko.com>2015-09-17 17:00:08 -0400
commit1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82 (patch)
tree3078931eaf7785303e12478e0cfd27ce4731dcf7 /include
parent5779b862d148294cc496ae2d6652584601ffd16e (diff)
parentc6d4705f41d4e45e8cecc6e08b0b89df1ffe57ef (diff)
downloadtalos-obmc-uboot-1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82.tar.gz
talos-obmc-uboot-1fb8d7933924aa5deb7e722d64c1d9fc7f0b2b82.zip
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/galileo.h1
-rw-r--r--include/dm/device.h11
2 files changed, 12 insertions, 0 deletions
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index b7ec2792bb..ba6c8f172b 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -15,6 +15,7 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_ARCH_MISC_INIT
/* ns16550 UART is memory-mapped in Quark SoC */
diff --git a/include/dm/device.h b/include/dm/device.h
index a239be6469..85196124b4 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -485,6 +485,17 @@ bool device_is_last_sibling(struct udevice *dev);
*/
int device_set_name(struct udevice *dev, const char *name);
+/**
+ * device_is_on_pci_bus - Test if a device is on a PCI bus
+ *
+ * @dev: device to test
+ * @return: true if it is on a PCI bus, false otherwise
+ */
+static inline bool device_is_on_pci_bus(struct udevice *dev)
+{
+ return device_get_uclass_id(dev->parent) == UCLASS_PCI;
+}
+
/* device resource management */
typedef void (*dr_release_t)(struct udevice *dev, void *res);
typedef int (*dr_match_t)(struct udevice *dev, void *res, void *match_data);
OpenPOWER on IntegriCloud