summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-10 22:57:41 -0400
committerTom Rini <trini@konsulko.com>2018-05-10 22:57:41 -0400
commit3aba3fd65490eff5305160e92937dc5592ab9bfb (patch)
treee07d43bb085f02ba440fda96b94ad7d4121dfebf /arch/arm/mach-socfpga
parentf739fcd831240dda10a92f4212f1854f8481aeee (diff)
parent792557d1110e13f82ee66dab57c5dca2102744da (diff)
downloadu-boot-3aba3fd65490eff5305160e92937dc5592ab9bfb.tar.gz
u-boot-3aba3fd65490eff5305160e92937dc5592ab9bfb.tar.xz
u-boot-3aba3fd65490eff5305160e92937dc5592ab9bfb.zip
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga')
-rw-r--r--arch/arm/mach-socfpga/include/mach/boot0.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
index 60194231c7..c78def5066 100644
--- a/arch/arm/mach-socfpga/include/mach/boot0.h
+++ b/arch/arm/mach-socfpga/include/mach/boot0.h
@@ -17,8 +17,8 @@ _start:
.word 0xcafec0d3; /* Checksum, zero-pad */
nop;
- b reset; /* SoCFPGA jumps here */
- nop;
+ b reset; /* SoCFPGA Gen5 jumps here */
+ b reset; /* SoCFPGA Gen10 trampoline */
nop;
nop;
#endif