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 /arch/nios2 | |
| parent | fdcb93e1709ab1a2ebb562455621617c29e2099c (diff) | |
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 'arch/nios2')
| -rw-r--r-- | arch/nios2/cpu/cpu.c | 1 | ||||
| -rw-r--r-- | arch/nios2/include/asm/io.h | 3 | ||||
| -rw-r--r-- | arch/nios2/lib/cache.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index e7ca9882fc..b55c8fbc58 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -13,6 +13,7 @@ #include <init.h> #include <irq_func.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <asm/system.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index 41e6bd4ee1..817cd72e00 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -7,6 +7,8 @@ #ifndef __ASM_NIOS2_IO_H_ #define __ASM_NIOS2_IO_H_ +#include <asm/global_data.h> + static inline void sync(void) { __asm__ __volatile__ ("sync" : : : "memory"); @@ -170,5 +172,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou #define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c)) #include <asm-generic/io.h> +#include <asm/global_data.h> #endif /* __ASM_NIOS2_IO_H_ */ diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c index 0b961ac676..5864d8f0f4 100644 --- a/arch/nios2/lib/cache.c +++ b/arch/nios2/lib/cache.c @@ -8,6 +8,7 @@ #include <common.h> #include <cpu_func.h> #include <asm/cache.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; |