From 1fd614e545b45719d5a1886629884ead9e597b5a Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Tue, 30 Apr 2024 17:29:54 +0100 Subject: [PATCH] arm-bsp: corstone1000: Configure Corstone-1000 to use the meta-arm-systemready layer Added the missing meta-arm-systemready required variable to enable its use with the corstone1000-fvp machine. Also explicitly set all the consoles. Signed-off-by: Drew Reed Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/corstone1000-fvp.conf | 5 ++++- meta-arm-bsp/conf/machine/include/corstone1000.inc | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index b15c0faa..c567058c 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -14,7 +14,10 @@ TEST_SUITES = "fvp_boot" # FVP Config FVP_PROVIDER ?= "fvp-corstone1000-native" FVP_EXE ?= "FVP_Corstone-1000" -FVP_CONSOLE ?= "host_terminal_0" +FVP_CONSOLES[default] = "host_terminal_0" +FVP_CONSOLES[tf-a] = "host_terminal_1" +FVP_CONSOLES[se] = "secenc_terminal" +FVP_CONSOLES[extsys] = "extsys_terminal" #Disable Time Annotation FASTSIM_DISABLE_TA = "0" diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 7a8905d7..3b8dcb79 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -55,6 +55,9 @@ WKS_FILE:firmware ?= "corstone1000-flash-firmware.wks.in" WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" # If not building under the firmware multiconf we need to build the actual firmware -FIRMWARE_DEPLOYEMENT ?= "firmware-deploy-image" -FIRMWARE_DEPLOYEMENT:firmware ?= "" -EXTRA_IMAGEDEPENDS += "${FIRMWARE_DEPLOYEMENT}" +FIRMWARE_DEPLOYMENT ?= "firmware-deploy-image" +FIRMWARE_DEPLOYMENT:firmware ?= "" +EXTRA_IMAGEDEPENDS += "${FIRMWARE_DEPLOYMENT}" + +ARM_SYSTEMREADY_FIRMWARE = "${FIRMWARE_DEPLOYMENT}:do_deploy" +ARM_SYSTEMREADY_ACS_CONSOLE ?= "default"