aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Auer2019-01-04 01:37:34 +0100
committerAndes2019-01-15 09:36:31 +0800
commit91882c472d8c0aef4db699d3f2de55bf43d4ae4b (patch)
tree85e6e59822ec4199a774dcd67ae0b957fab83330
parent7eb792970e3af4aa0c99a972411f239b0fc03a63 (diff)
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>
-rw-r--r--arch/riscv/config.mk2
-rw-r--r--include/configs/qemu-riscv.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index e484a3f0ef0..84654eb3ed8 100644
--- 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 b29d155d095..2588c5a0b25 100644
--- 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