ARM: socfpga: boot0 hook: remove macro from boot0 header file
authorChee, Tien Fong <tien.fong.chee@intel.com>
Wed, 29 Mar 2017 03:49:16 +0000 (11:49 +0800)
committerMarek Vasut <marex@denx.de>
Fri, 14 Apr 2017 12:06:42 +0000 (14:06 +0200)
Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file") miss out cleaning macro in this header file, and this
has broken implementation of a boot header capability in socfpga
SPL. Remove the macro in this file, and recovering it back
to proper functioning.

Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file")

Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
arch/arm/mach-socfpga/include/mach/boot0.h

index aaada31286055a14089bd7a4885455cf6b11ca76..22d9e7f7afbeee27aa0473b926a3b231d0dc209c 100644 (file)
@@ -8,21 +8,17 @@
 #define __BOOT0_H
 
 #ifdef CONFIG_SPL_BUILD
-#define ARM_SOC_BOOT0_HOOK                                             \
-       .balignl 64,0xf33db33f;                                         \
-                                                                       \
-       .word   0x1337c0d3;     /* SoCFPGA preloader validation word */ \
-       .word   0xc01df00d;     /* Version, flags, length */            \
-       .word   0xcafec0d3;     /* Checksum, zero-pad */                \
-       nop;                                                            \
-                                                                       \
-       b reset;                /* SoCFPGA jumps here */                \
-       nop;                                                            \
-       nop;                                                            \
+       .balignl 64,0xf33db33f;
+
+       .word   0x1337c0d3;     /* SoCFPGA preloader validation word */
+       .word   0xc01df00d;     /* Version, flags, length */
+       .word   0xcafec0d3;     /* Checksum, zero-pad */
        nop;
-#else
-#define ARM_SOC_BOOT0_HOOK
-#endif
 
+       b reset;                /* SoCFPGA jumps here */
+       nop;
+       nop;
+       nop;
+#endif
 
 #endif /* __BOOT0_H */