diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2024-01-09 19:33:25 -0800 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2024-01-09 20:10:39 -0800 |
| commit | 2bf8acbf542bbc83a72a1c9d3f4f87aab7f2d2c1 (patch) | |
| tree | aad20181183a1f01a7139b7afb5665eb2f793cc2 /arch/riscv/Kconfig | |
| parent | a7565f4d068b2e60f95c3223c3167c40b8fe83ae (diff) | |
| parent | 6c4a2f6329f0925161a80d2fd90aa8438c1ca82f (diff) | |
Merge patch series "Fix XIP boot and make XIP testable in QEMU"
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>
Diffstat (limited to 'arch/riscv/Kconfig')
| -rw-r--r-- | arch/riscv/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 5e12582f66d4..19dfd521a52a 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -905,13 +905,13 @@ config RISCV_ISA_FALLBACK on the replacement properties, "riscv,isa-base" and "riscv,isa-extensions". -endmenu # "Boot options" - config BUILTIN_DTB - bool + bool "Built-in device tree" depends on OF && NONPORTABLE default y if XIP_KERNEL +endmenu # "Boot options" + config PORTABLE bool default !NONPORTABLE |