diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-30 20:40:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-06 15:07:48 -0600 |
| commit | 6a7185887b83a5cc334c7ce5bd65970381b2f4ce (patch) | |
| tree | b24fe505f1ec074073b0ff9d545a3a55b290a495 /arch/m68k | |
| parent | 7410cde67de051ba6e7650ed6d714fb6b132c3f4 (diff) | |
| download | u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.tar.gz | |
global: Make <asm/global_data.h> include <asm/u-boot.h>
This follows the example of RISC-V where <asm/global_data.h> includes
<asm/u-boot.h> directly as "gd" includes a reference to bd_info already
and so the first must include the second anyhow. We then remove
<asm/u-boot.h> from all of the places which include references to "gd"
an so have <asm/global_data.h> already.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/global_data.h | 2 | ||||
| -rw-r--r-- | arch/m68k/lib/bdinfo.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index c2ef5770a3d..93efc722ba8 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -7,6 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <asm/u-boot.h> + /* Architecture-specific global data */ struct arch_global_data { #ifdef CONFIG_SYS_I2C_FSL diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 3719f11c03c..cf6ae5adddf 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/lib/bdinfo.c @@ -8,7 +8,6 @@ #include <config.h> #include <init.h> -#include <asm/u-boot.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; |