spl: Fix guardian macros in spl.h

Fix the macros guarding the spl.h header for various platforms. Due to
a typo and a propagation of it, the macros went out-of-sync with their
ifdef check, so fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>

diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index 2df4114580dadd3ef6e71b6bcdfefdb9bac24961..8543f4399c856c9a345fd1d94076e3ff59888083 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #if defined(CONFIG_TI816X)
 #define BOOT_DEVICE_XIP                2

diff --git a/arch/arm/include/asm/arch-davinci/spl.h b/arch/arm/include/asm/arch-davinci/spl.h
index 5aa5d2d019f1e9c9ffc96d0ef0d532bb57082e97..5afe0d4ba53fa30bfde8f54fb531ed8b05f08e32 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/spl.h
+++ b/arch/arm/include/asm/arch-davinci/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #define BOOT_DEVICE_NAND       1
 #define BOOT_DEVICE_SPI                2

diff --git a/arch/arm/include/asm/arch-mx35/spl.h b/arch/arm/include/asm/arch-mx35/spl.h
index f87c137c98c96f828f11959df6a8a5d99e8c4c12..d0efec21ab64d0072d56d72cfd7bafb0ea4e479d 100644 (file)
--- a/arch/arm/include/asm/arch-mx35/spl.h
+++ b/arch/arm/include/asm/arch-mx35/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #define BOOT_DEVICE_NONE       0
 #define BOOT_DEVICE_XIP                1

diff --git a/arch/arm/include/asm/arch-omap3/spl.h b/arch/arm/include/asm/arch-omap3/spl.h
index 2ec319c08a56b9b884ee25f0057357b5f9e03839..835053278647a85d030f7205db0aba9604e7a998 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/spl.h
+++ b/arch/arm/include/asm/arch-omap3/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #define BOOT_DEVICE_NONE       0
 #define BOOT_DEVICE_XIP                1

diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h
index 551b27df14798ca67a0d7632e144030d6cd50055..fb842a22640ce68decb8e4500f6aa1df6d5faa60 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/spl.h
+++ b/arch/arm/include/asm/arch-omap4/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #define BOOT_DEVICE_NONE       0
 #define BOOT_DEVICE_XIP                1

diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h
index 4a279cf0525b56a65cd9ed3a58bdd62bc8ab32e8..f70799860f4d387396317cacb04bf7c9a9a122f2 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/spl.h
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
 #define BOOT_DEVICE_NONE        0
 #define BOOT_DEVICE_XIP         1