qemu-riscv64_smode: Load custom envitonment if possible

Check if loadbootenv and importbootenv environment variables are available
and use them to load additional environment variables.

Change-Id: I4e85a6a248cb6e1b5314771fda2e0f9df406417a
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 1cb06b4..8589f0a 100644 (file)
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -12,7 +12,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr}; test -n \"${loadbootenv}\" -a -n \"${importbootenv}\" && run loadbootenv && run importbootenv;"
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_CBSIZE=256