Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4c0f3e7f7b7fc29d0bdbef20e849e3360c432891

Authored by Chee, Tien Fong
Committed by Marek Vasut
1 parent 45fa6f1dd5
Exists in smarc_8mq_lf_v2020.04 and in 18 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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

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>

Showing 1 changed file with 10 additions and 14 deletions Side-by-side Diff

arch/arm/mach-socfpga/include/mach/boot0.h
Diff comments   View file @ 4c0f3e7
... ... @@ -8,22 +8,18 @@
8 8 #define __BOOT0_H
9 9  
10 10 #ifdef CONFIG_SPL_BUILD
11   -#define ARM_SOC_BOOT0_HOOK \
12   - .balignl 64,0xf33db33f; \
13   - \
14   - .word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
15   - .word 0xc01df00d; /* Version, flags, length */ \
16   - .word 0xcafec0d3; /* Checksum, zero-pad */ \
17   - nop; \
18   - \
19   - b reset; /* SoCFPGA jumps here */ \
20   - nop; \
21   - nop; \
  11 + .balignl 64,0xf33db33f;
  12 +
  13 + .word 0x1337c0d3; /* SoCFPGA preloader validation word */
  14 + .word 0xc01df00d; /* Version, flags, length */
  15 + .word 0xcafec0d3; /* Checksum, zero-pad */
22 16 nop;
23   -#else
24   -#define ARM_SOC_BOOT0_HOOK
25   -#endif
26 17  
  18 + b reset; /* SoCFPGA jumps here */
  19 + nop;
  20 + nop;
  21 + nop;
  22 +#endif
27 23  
28 24 #endif /* __BOOT0_H */