summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJules Maselbas <jmaselbas@kalray.eu>2022-01-17 23:19:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2022-01-18 09:07:27 +0100
commitcd55874ed9faa1768af98e766e74b3ed54af3f2a (patch)
treee13400a26166327665ee0cd0e24abd60b49a7fc5 /arch
parent9ded43094bae729156205a40205fd76d3b9c9daa (diff)
downloadbarebox-cd55874ed9faa1768af98e766e74b3ed54af3f2a.tar.gz
barebox-cd55874ed9faa1768af98e766e74b3ed54af3f2a.tar.xz
kvx: Accept LINUX_BOOT_PARAM_MAGIC as a valid magic value
Both defines FSBL_PARAM_MAGIC and LINUX_BOOT_PARAM_MAGIC have a similar uses and yet have different values. Making barebox accept both as valid magic boot param will make it possible to use qemu-system-kvx to boot a barebox image as a normal kernel. Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu> Link: https://lore.barebox.org/20220117221917.26970-4-jmaselbas@kalray.eu Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/kvx/cpu/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/kvx/cpu/cpu.c b/arch/kvx/cpu/cpu.c
index 788d3194fe..4b0d4d2d96 100644
--- a/arch/kvx/cpu/cpu.c
+++ b/arch/kvx/cpu/cpu.c
@@ -16,7 +16,7 @@ void kvx_lowlevel_setup(unsigned long r0, void *dtb_ptr)
{
uint64_t ev_val = (uint64_t) &_exception_start | EXCEPTION_STRIDE;
- if (r0 == FSBL_PARAM_MAGIC) {
+ if (r0 == FSBL_PARAM_MAGIC || r0 == LINUX_BOOT_PARAM_MAGIC) {
boot_dtb = dtb_ptr;
pr_info("Using DTB provided by FSBL\n");
}