riscv: qemu: define standalone load address

We need to define the standalone load address to use standalone
application on qemu-riscv. Define it and set it equal to
CONFIG_SYS_LOAD_ADDR.

To not overwrite it, change the assigned of CONFIG_STANDALONE_LOAD_ADDR
in arch/riscv/config.mk to a conditional one.

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index e484a3f0ef08a3ad9ad1e3ffa6165396572bc2dc..84654eb3ed87e72a153f43ee3831377f323f0755 100644 (file)
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -23,7 +23,7 @@ PLATFORM_LDFLAGS      += -m $(64bit-emul)
 EFI_LDS                        := elf_riscv64_efi.lds
 endif
 
-CONFIG_STANDALONE_LOAD_ADDR = 0x00000000
+CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
 
 PLATFORM_CPPFLAGS      += -ffixed-gp -fpic
 PLATFORM_RELFLAGS      += -fno-common -gdwarf-2 -ffunction-sections \

diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index b29d155d095c4704655ba9c974329fee8c169a52..2588c5a0b25d917f5f37a003bec7d298d59837cc 100644 (file)
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -17,6 +17,8 @@
 
 #define CONFIG_SYS_BOOTM_LEN           SZ_16M
 
+#define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
+
 /* Environment options */
 #define CONFIG_ENV_SIZE                        SZ_4K