diff options
author | Simon Glass <sjg@chromium.org> | 2020-10-30 21:38:53 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-02-02 15:33:42 -0500 |
commit | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (patch) | |
tree | 0122abb2a3f1ea9837eaccc6150d2dae9570388e /lib | |
parent | fdcb93e1709ab1a2ebb562455621617c29e2099c (diff) | |
download | u-boot-401d1c4f5d2d29c4bc4beaec95402ca23eb63295.zip u-boot-401d1c4f5d2d29c4bc4beaec95402ca23eb63295.tar.gz u-boot-401d1c4f5d2d29c4bc4beaec95402ca23eb63295.tar.bz2 |
common: Drop asm/global_data.h from common header
Move this out of the common header and include it only where needed. In
a number of cases this requires adding "struct udevice;" to avoid adding
another large header or in other cases replacing / adding missing header
files that had been pulled in, very indirectly. Finally, we have a few
cases where we did not need to include <asm/global_data.h> at all, so
remove that include.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/acpi/acpi_table.c | 1 | ||||
-rw-r--r-- | lib/asm-offsets.c | 1 | ||||
-rw-r--r-- | lib/efi/efi_app.c | 1 | ||||
-rw-r--r-- | lib/efi/efi_info.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_boottime.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_dt_fixup.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_gop.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_memory.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_rng.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_runtime.c | 1 | ||||
-rw-r--r-- | lib/efi_selftest/dtbdump.c | 1 | ||||
-rw-r--r-- | lib/fdtdec.c | 1 | ||||
-rw-r--r-- | lib/optee/optee.c | 1 | ||||
-rw-r--r-- | lib/time.c | 1 | ||||
-rw-r--r-- | lib/trace.c | 1 | ||||
-rw-r--r-- | lib/zlib/zlib.c | 2 |
16 files changed, 16 insertions, 1 deletions
diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index a0f0961b..2f07741 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -13,6 +13,7 @@ #include <tables_csum.h> #include <version.h> #include <acpi/acpi_table.h> +#include <asm/global_data.h> #include <dm/acpi.h> int acpi_create_dmar(struct acpi_dmar *dmar, enum dmar_flags flags) diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index b17651e..ee592cf 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -13,6 +13,7 @@ #include <common.h> #include <asm-offsets.h> +#include <asm/global_data.h> #include <linux/kbuild.h> diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c index b7e19c3..907bacd 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi/efi_app.c @@ -15,6 +15,7 @@ #include <errno.h> #include <init.h> #include <malloc.h> +#include <asm/global_data.h> #include <linux/err.h> #include <linux/types.h> #include <efi.h> diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c index 35a8a93..4d78923 100644 --- a/lib/efi/efi_info.c +++ b/lib/efi/efi_info.c @@ -9,6 +9,7 @@ #include <efi.h> #include <errno.h> #include <mapmem.h> +#include <asm/global_data.h> int efi_info_get(enum efi_entry_t type, void **datap, int *sizep) { diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ce658a8..41b8949 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -19,6 +19,7 @@ #include <u-boot/crc.h> #include <usb.h> #include <watchdog.h> +#include <asm/global_data.h> #include <linux/libfdt_env.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_dt_fixup.c b/lib/efi_loader/efi_dt_fixup.c index 3850ab3..580551b 100644 --- a/lib/efi_loader/efi_dt_fixup.c +++ b/lib/efi_loader/efi_dt_fixup.c @@ -8,6 +8,7 @@ #include <common.h> #include <efi_dt_fixup.h> #include <efi_loader.h> +#include <fdtdec.h> #include <mapmem.h> const efi_guid_t efi_guid_dt_fixup_protocol = EFI_DT_FIXUP_PROTOCOL_GUID; diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 53f6d97..1206b2d 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -12,6 +12,7 @@ #include <log.h> #include <malloc.h> #include <video.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index a3106ab..be2f655 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -12,6 +12,7 @@ #include <mapmem.h> #include <watchdog.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <linux/list_sort.h> #include <linux/sizes.h> diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c index 8bdadad..0e06546 100644 --- a/lib/efi_loader/efi_rng.c +++ b/lib/efi_loader/efi_rng.c @@ -11,6 +11,7 @@ #include <efi_rng.h> #include <log.h> #include <rng.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 93c9478..93a695f 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -14,6 +14,7 @@ #include <log.h> #include <malloc.h> #include <rtc.h> +#include <asm/global_data.h> #include <u-boot/crc.h> /* For manual relocation support */ diff --git a/lib/efi_selftest/dtbdump.c b/lib/efi_selftest/dtbdump.c index 953b264..844d082 100644 --- a/lib/efi_selftest/dtbdump.c +++ b/lib/efi_selftest/dtbdump.c @@ -9,6 +9,7 @@ #include <common.h> #include <efi_api.h> #include <efi_dt_fixup.h> +#include <linux/libfdt.h> #define BUFFER_SIZE 64 #define ESC 0x17 diff --git a/lib/fdtdec.c b/lib/fdtdec.c index a2d2fb4..2b25037 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -21,6 +21,7 @@ #include <mapmem.h> #include <linux/libfdt.h> #include <serial.h> +#include <asm/global_data.h> #include <asm/sections.h> #include <linux/ctype.h> #include <linux/lzo.h> diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 9e66065..4dcf6f9 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <fdtdec.h> #include <image.h> #include <log.h> #include <malloc.h> @@ -14,6 +14,7 @@ #include <timer.h> #include <watchdog.h> #include <div64.h> +#include <asm/global_data.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/lib/trace.c b/lib/trace.c index defc971..9e34b19 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -7,6 +7,7 @@ #include <mapmem.h> #include <time.h> #include <trace.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/sections.h> diff --git a/lib/zlib/zlib.c b/lib/zlib/zlib.c index 90e05e7..493fe19 100644 --- a/lib/zlib/zlib.c +++ b/lib/zlib/zlib.c @@ -12,7 +12,7 @@ * - added inflateIncomp */ -#include <common.h> +#include <compiler.h> #ifdef CONFIG_GZIP_COMPRESSED #define NO_DUMMY_DECL |