Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arch/riscv/include/asm/xip_fixup.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
*
* The start of data in Flash is _sdata and the start of data in RAM is
* CONFIG_PHYS_RAM_BASE. So this fix-up essentially does this:
* reg += CONFIG_PHYS_RAM_BASE - _start
* reg += CONFIG_PHYS_RAM_BASE - _sdata
*/
li t0, CONFIG_PHYS_RAM_BASE
add \reg, \reg, t0
add \reg, \reg, t0
la t0, _sdata
sub \reg, \reg, t0
.endm
Expand Down
4 changes: 2 additions & 2 deletions arch/riscv/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ relocate_enable_mmu:
sub a1, a1, a2
add ra, ra, a1

/* Point stvec to virtual address of intruction after satp write */
/* Point stvec to virtual address of instruction after satp write */
la a2, 1f
add a2, a2, a1
csrw CSR_TVEC, a2
Expand Down Expand Up @@ -273,7 +273,7 @@ SYM_CODE_START(_start_kernel)
/* first time here if hart_lottery in RAM is not set */
beq t0, t1, .Lsecondary_start

#endif /* CONFIG_XIP */
#endif /* CONFIG_XIP_KERNEL */
#endif /* CONFIG_RISCV_BOOT_SPINWAIT */

#ifdef CONFIG_XIP_KERNEL
Expand Down