diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /include/dm | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.bz2 u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.zip | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'include/dm')
| -rw-r--r-- | include/dm/acpi.h | 1 | ||||
| -rw-r--r-- | include/dm/ofnode.h | 2 | ||||
| -rw-r--r-- | include/dm/read.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/dm/acpi.h b/include/dm/acpi.h index e6951b6a25..7f1f2ef2cb 100644 --- a/include/dm/acpi.h +++ b/include/dm/acpi.h @@ -28,6 +28,7 @@ #if !defined(__ACPI__) struct nhlt; +struct udevice; /** enum acpi_dump_option - selects what ACPI information to dump */ enum acpi_dump_option { diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 5b088650d3..5318d65035 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -379,6 +379,8 @@ bool ofnode_read_bool(ofnode node, const char *propname); ofnode ofnode_find_subnode(ofnode node, const char *subnode_name); #if CONFIG_IS_ENABLED(DM_INLINE_OFNODE) +#include <asm/global_data.h> + static inline bool ofnode_is_enabled(ofnode node) { if (ofnode_is_np(node)) { diff --git a/include/dm/read.h b/include/dm/read.h index 03ba98232a..97575bcad0 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -695,6 +695,7 @@ int dev_decode_display_timing(const struct udevice *dev, int index, struct display_timing *config); #else /* CONFIG_DM_DEV_READ_INLINE is enabled */ +#include <asm/global_data.h> static inline int dev_read_u32(const struct udevice *dev, const char *propname, u32 *outp) |