Skip to contentSkip to conversation

ARM: socfpga: boot0 hook: remove macro from boot0 header file

PATCH New tien.fong.chee at intel.com 2 participants 2 messages Mar 29, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/socfpga architecture
lore
Share & tools
lore

tien.fong.chee at intel.com

author
#0 lore raw

PATCH 1/1 ARM: socfpga: boot0 hook: remove macro from boot0 header file

From: "Chee, Tien Fong" <[email protected]>

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 <[email protected]>
---
 arch/arm/mach-socfpga/include/mach/boot0.h | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-socfpga/include/mach/boot0.h +0 -4
index aaada31..40f9d32 100644
@@ -8,7 +8,6 @@
 #define __BOOT0_H
 
 #ifdef CONFIG_SPL_BUILD
-#define ARM_SOC_BOOT0_HOOK						\
 	.balignl 64,0xf33db33f;						\
 									\
 	.word	0x1337c0d3;	/* SoCFPGA preloader validation word */	\

@@ -20,9 +19,6 @@
 	nop;								\
 	nop;								\
 	nop;
-#else
-#define ARM_SOC_BOOT0_HOOK
 #endif
 
-
 #endif /* __BOOT0_H */
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 ARM: socfpga: boot0 hook: remove macro from boot0 header file

Quoted 8 lines · tien.fong.chee at intel.com

From: "Chee, Tien Fong" <[email protected]>

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.

Please ignore this patch, i will send out another patch. Thanks.

Quoted 37 lines
Fixes ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole

header file")

Signed-off-by Chee, Tien Fong <[email protected]>

---
 arch/arm/mach-socfpga/include/mach/boot0.h | 4 ----

 1 file changed, 4 deletions(-)
arch/arm/mach-socfpga/include/mach/boot0.h +0 -0
index aaada31..40f9d32 100644
@@ -8,7 +8,6 @@
  #define __BOOT0_H


 #ifdef CONFIG_SPL_BUILD
-#define ARM_SOC_BOOT0_HOOK
\

 	.balignl 64,0xf33db33f;					
	\


\
  .word 0x1337c0d3; /* SoCFPGA preloader
validation word */ \

arch/arm/mach-socfpga/include/mach/boot0.h +0 -2
@@ -20,9 +19,6 @@
  	nop;								
 \
  	nop;								
 \
  	nop;
-#else
-#define ARM_SOC_BOOT0_HOOK
  #endif


-
 #endif /* __BOOT0_H */