diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-14 09:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-14 09:05:57 -0400 |
| commit | c1a16c3ab541c014b029b42cc27cae496107e170 (patch) | |
| tree | e5da12851a4d920d9b79fa8547db9f479e506fed /arch/arm/mach-socfpga/include/mach/boot0.h | |
| parent | af1b7286d8b2712cff5779d8a1565afed9d9d8e6 (diff) | |
| parent | 09397d99edb402c04d1e20b32989b5b2ecbb037a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach/boot0.h')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/boot0.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h index aaada312860..22d9e7f7afb 100644 --- a/arch/arm/mach-socfpga/include/mach/boot0.h +++ b/arch/arm/mach-socfpga/include/mach/boot0.h @@ -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 */ |