From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 19 Jun 2019 23:48:32 +0000 (-0700)
Subject: qemuriscv: Build uImage for RISC-V machines
X-Git-Tag: uninative-2.7~996
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=12dc5569d832d57b52ed68bc9009506b2d183795;p=openembedded-core.git

qemuriscv: Build uImage for RISC-V machines

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc
index aa1eba77da..84d09fa78e 100644
--- a/meta/conf/machine/include/riscv/qemuriscv.inc
+++ b/meta/conf/machine/include/riscv/qemuriscv.inc
@@ -6,6 +6,8 @@ require conf/machine/include/riscv/tune-riscv.inc
 MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 
 KERNEL_IMAGETYPE = "Image"
+KERNEL_IMAGETYPES += "uImage"
+KEEPUIMAGE = "no"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0"
 
@@ -17,6 +19,9 @@ EXTRA_IMAGEDEPENDS += "opensbi"
 RISCV_SBI_PLAT ?= "qemu/virt"
 RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
 
+UBOOT_ENTRYPOINT_riscv32 = "0x80400000"
+UBOOT_ENTRYPOINT_riscv64 = "0x80200000"
+
 # qemuboot options
 QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi"
 QB_MEM = "-m 512"