| Message ID | 20230515135214.4083319-2-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 4ee992f7cf907d269d20a26d90513ef67b371dd5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Fix inclusion guards | expand |
On Mon, May 15, 2023 at 02:52:10PM +0100, Andre Przywara wrote: > It seems like the header inclusion guards for some IMX related headers > were misspelled or got out of sync. > > Make the preprocessor symbols for the #ifndef and #define lines the > same, so that the double inclusion protection works as expected. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Mon, May 15, 2023 at 02:52:10PM +0100, Andre Przywara wrote: > It seems like the header inclusion guards for some IMX related headers > were misspelled or got out of sync. > > Make the preprocessor symbols for the #ifndef and #define lines the > same, so that the double inclusion protection works as expected. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/next, thanks!
diff --git a/arch/arm/include/asm/arch-imx8m/sys_proto.h b/arch/arm/include/asm/arch-imx8m/sys_proto.h index 55b46afaf78..4ed8e954e31 100644 --- a/arch/arm/include/asm/arch-imx8m/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8m/sys_proto.h @@ -4,7 +4,7 @@ */ #ifndef __ARCH_IMX8M_SYS_PROTO_H -#define __ARCH_NMX8M_SYS_PROTO_H +#define __ARCH_IMX8M_SYS_PROTO_H #include <asm/mach-imx/sys_proto.h> #include <asm/arch/imx-regs.h> diff --git a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h index 5bbae21e37c..95bf753a766 100644 --- a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h @@ -4,7 +4,7 @@ */ #ifndef __ARCH_IMX8ULP_SYS_PROTO_H -#define __ARCH_NMX8ULP_SYS_PROTO_H +#define __ARCH_IMX8ULP_SYS_PROTO_H #include <asm/mach-imx/sys_proto.h> diff --git a/arch/arm/include/asm/arch-imx9/sys_proto.h b/arch/arm/include/asm/arch-imx9/sys_proto.h index ba97f92f5ae..2f7a1292758 100644 --- a/arch/arm/include/asm/arch-imx9/sys_proto.h +++ b/arch/arm/include/asm/arch-imx9/sys_proto.h @@ -4,7 +4,7 @@ */ #ifndef __ARCH_IMX9_SYS_PROTO_H -#define __ARCH_NMX9_SYS_PROTO_H +#define __ARCH_IMX9_SYS_PROTO_H #include <asm/mach-imx/sys_proto.h> diff --git a/include/imx_sip.h b/include/imx_sip.h index 1b873f231be..ebbb3a16d7e 100644 --- a/include/imx_sip.h +++ b/include/imx_sip.h @@ -4,7 +4,7 @@ */ #ifndef _IMX_SIP_H__ -#define _IMX_SIP_H_ +#define _IMX_SIP_H__ #define IMX_SIP_GPC 0xC2000000 #define IMX_SIP_GPC_PM_DOMAIN 0x03
It seems like the header inclusion guards for some IMX related headers were misspelled or got out of sync. Make the preprocessor symbols for the #ifndef and #define lines the same, so that the double inclusion protection works as expected. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/include/asm/arch-imx8m/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx8ulp/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx9/sys_proto.h | 2 +- include/imx_sip.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)