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/powerpc/include | |
| parent | 7410cde67de051ba6e7650ed6d714fb6b132c3f4 (diff) | |
| download | u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.zip u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.tar.gz u-boot-6a7185887b83a5cc334c7ce5bd65970381b2f4ce.tar.bz2 | |
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/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_liodn.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/fsl_portals.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h index 0af3d89..4ce869b 100644 --- a/arch/powerpc/include/asm/fsl_liodn.h +++ b/arch/powerpc/include/asm/fsl_liodn.h @@ -6,7 +6,9 @@ #ifndef _FSL_LIODN_H_ #define _FSL_LIODN_H_ -#include <asm/types.h> +#include <config.h> +#include <linux/types.h> +#include <asm/ppc.h> #include <fsl_qbman.h> struct srio_liodn_id_table { diff --git a/arch/powerpc/include/asm/fsl_portals.h b/arch/powerpc/include/asm/fsl_portals.h index 54ef4fb..021eec7 100644 --- a/arch/powerpc/include/asm/fsl_portals.h +++ b/arch/powerpc/include/asm/fsl_portals.h @@ -6,6 +6,8 @@ #ifndef _FSL_PORTALS_H_ #define _FSL_PORTALS_H_ +#include <linux/types.h> + /* entries must be in order and contiguous */ enum fsl_dpaa_dev { FSL_HW_PORTAL_SEC, diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index f786012..a9efbbd 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -93,4 +93,6 @@ struct arch_global_data { #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2") +#include <asm/u-boot.h> + #endif /* __ASM_GBL_DATA_H */ |