kconfigs: add qemu riscv64 kconfigs

Add a kconfig conf file for QEMU RISC-V 64.

Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
Tested-by: Marouene Boubakri <marouene.boubakri@nxp.com>
Acked-by: Jens Wiklander <jens.wiklander@oss.qualcomm.com>
Acked-by: Jerome Forissier <jerome.forissier@arm.com>

Author: raymondriscstar

kconfigs/u-boot_qemu_riscv64.conf

@@ -0,0 +1,9 @@
+CONFIG_SPL_OPTEE_LOAD_ADDR=0xf1000000
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_OPTEE_LIB=y
+CONFIG_OPTEE_TZDRAM_SIZE=0x0
+CONFIG_RNG_OPTEE=y
+CONFIG_CMD_RNG=y
+CONFIG_SPL_SYS_MALLOC_SIZE=0x0200000
+CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0

qemu_riscv64.mk

@@ -102,14 +102,15 @@ opensbi-clean:
 ################################################################################
 # U-Boot
 ################################################################################
-UBOOT_DEFCONFIG := qemu-riscv64_spl_defconfig
+UBOOT_DEFCONFIG_FILES := $(UBOOT_PATH)/configs/qemu-riscv64_spl_defconfig \
+			 $(ROOT)/build/kconfigs/u-boot_qemu_riscv64.conf
 UBOOT_COMMON_FLAGS += CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL)
 UBOOT_COMMON_FLAGS += OPENSBI=$(OPENSBI_FW_DYNAMIC_BIN)
 UBOOT_COMMON_FLAGS += TEE=$(OPTEE_OS_BIN)
 
-$(UBOOT_PATH)/.config:
-	$(MAKE) -C $(UBOOT_PATH) $(UBOOT_DEFCONFIG)
-	$(MAKE) -C $(UBOOT_PATH) olddefconfig
+$(UBOOT_PATH)/.config: $(UBOOT_DEFCONFIG_FILES)
+	cd $(UBOOT_PATH) && scripts/kconfig/merge_config.sh \
+		$(UBOOT_DEFCONFIG_FILES)
 
 .PHONY: u-boot-defconfig
 u-boot-defconfig: $(UBOOT_PATH)/.config