| Message ID | 1490758137-12858-1-git-send-email-tien.fong.chee@intel.com |
|---|---|
| State | Not Applicable |
| Delegated to: | Marek Vasut |
| Headers | show |
On Rab, 2017-03-29 at 11:28 +0800, tien.fong.chee@intel.com wrote: > From: "Chee, Tien Fong" <tien.fong.chee@intel.com> > > 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. > 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 | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h > b/arch/arm/mach-socfpga/include/mach/boot0.h > index aaada31..40f9d32 100644 > --- a/arch/arm/mach-socfpga/include/mach/boot0.h > +++ b/arch/arm/mach-socfpga/include/mach/boot0.h > @@ -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 */
diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h index aaada31..40f9d32 100644 --- a/arch/arm/mach-socfpga/include/mach/boot0.h +++ b/arch/arm/mach-socfpga/include/mach/boot0.h @@ -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 */