Move setting of RPMB device id to the board file

Device id will change per-platform. Move it out of the core
configuration file.
Signed-off-by: Grant Likely <grant.likely@arm.com>

board-qemu-arm.mk

@@ -5,6 +5,8 @@ OPTEE_PLATFORM := vexpress-qemu_armv8a
 UBOOT_EXTRA_CONFIGS += scripts/qemu_arm64_tfa.config
 FLASH_IMAGE := nor_flash.bin
 
+OPTEE_EXTRA += CFG_RPMB_FS_DEV_ID=1
+
 ifneq ($(CONFIG_TFABOOT)$(CONFIG_POSITION_INDEPENDENT),yy)
 tweakconfig:
 	echo "CONFIG_POSITION_INDEPENDENT=y" >> $(UBOOT_OUTPUT)/.config

top.mk

@@ -224,7 +224,6 @@ OPTEE_EXTRA += CROSS_COMPILE32=arm-linux-gnueabihf-
 OPTEE_EXTRA += PLATFORM=$(OPTEE_PLATFORM)
 OPTEE_EXTRA += CFG_ARM64_core=y
 OPTEE_EXTRA += CFG_RPMB_FS=y
-OPTEE_EXTRA += CFG_RPMB_FS_DEV_ID=1
 OPTEE_EXTRA += CFG_RPMB_WRITE_KEY=1
 OPTEE_EXTRA += CFG_CORE_HEAP_SIZE=524288
 #OPTEE_EXTRA += CFG_TEE_CORE_LOG_LEVEL=3