aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze/cpu/start.S
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-10-31 14:43:04 -0400
committerTom Rini <trini@konsulko.com>2022-10-31 14:43:04 -0400
commita90afc6730e6c67ad37f4c98a02891a93b4ff971 (patch)
tree724c085433631e142a56c052d667139cba29b4a6 /arch/microblaze/cpu/start.S
parent6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff)
parent77bec9e3d8bd2dc307447b92a3d5cefd693a62ad (diff)
Merge branch '2022-10-31-vbe-implement-the-full-firmware-flow'
To quote Simon: This series provides an implementation of VBE from TPL through to U-Boot proper, using VBE to load the relevant firmware stages. It buils a single image.bin file containing all the phases: TPL - initial phase, loads VPL using binman symbols VPL - main firmware phase, loads SPL using VBE parameters SPL - loads U-Boot proper using VBE parameters U-Boot - final firmware phase, where OS booting is processed This series does not include the OS-booting phase. That will be the subject of a future series. The implementation is entirely handled by sandbox. It should be possible to enable this on a real board without much effort, but that is also the subject of a future series.
Diffstat (limited to 'arch/microblaze/cpu/start.S')
-rw-r--r--arch/microblaze/cpu/start.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index a877db305e..7079d9e170 100644
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -55,15 +55,15 @@ uboot_sym_start:
add r6, r0, r0
lwi r7, r20, ALIGNMENT_ADDR
- addi r7, r7, -CONFIG_SYS_TEXT_BASE
+ addi r7, r7, -CONFIG_TEXT_BASE
add r7, r7, r5
lwi r8, r20, ALIGNMENT_ADDR + 0x4
- addi r8, r8, -CONFIG_SYS_TEXT_BASE
+ addi r8, r8, -CONFIG_TEXT_BASE
add r8, r8, r5
lwi r9, r20, ALIGNMENT_ADDR + 0x8
- addi r9, r9, -CONFIG_SYS_TEXT_BASE
+ addi r9, r9, -CONFIG_TEXT_BASE
add r9, r9, r5
- addi r10, r0, CONFIG_SYS_TEXT_BASE
+ addi r10, r0, CONFIG_TEXT_BASE
brlid r15, mb_fix_rela
nop