]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge patch series "Fix XIP boot and make XIP testable in QEMU"
authorPalmer Dabbelt <palmer@rivosinc.com>
Wed, 10 Jan 2024 03:33:25 +0000 (19:33 -0800)
committerPalmer Dabbelt <palmer@rivosinc.com>
Wed, 10 Jan 2024 04:10:39 +0000 (20:10 -0800)
Frederik Haxel <haxel@fzi.de> says:

XIP boot seems to be broken for some time now. A likely reason why no one
seems to have noticed this is that XIP is more difficult to test, as it is
currently not easily testable with QEMU.

These patches fix the XIP boot and allow an XIP build without BUILTIN_DTB,
which in turn makes it easier to test an image with the QEMU virt machine.

* b4-shazam-merge:
  riscv: Allow disabling of BUILTIN_DTB for XIP
  riscv: Fixed wrong register in XIP_FIXUP_FLASH_OFFSET macro
  riscv: Make XIP bootable again

Link: https://lore.kernel.org/r/20231212130116.848530-1-haxel@fzi.de
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1  2 
arch/riscv/Kconfig
arch/riscv/kernel/head.S

Simple merge
Simple merge