commit 93a1f783a6bc8d9f3c70b1bea0d7195441e3a3d7
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Mar 02 13:59:33 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Thu Mar 02 13:59:36 2023 +0800
tree a4266466b257733599bafbd08b512931625ac87a
parent 9eca8c16a95887ddf2e3c3a0814920035b304bdb

Hotfix: Disable creating and testing images on Corstone1000

To create Corstone1000 images, CI infra needs to install some plugins.
Currently the image tool of Corstone1000 would cause unexpected failure
in CI and get jobs blocked.

This is a hotfix patch to temporarily disable creating and testing
images on Corstone1000 to unblock CI jobs. Build for Corstone1000 is
still covered.

This patch will be reverted once CI infra is ready.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ia8caf4b413b894b41cec8a82c0b58712c76c72f8

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 8f5a8a1..5eb20ed 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -86,7 +86,6 @@
                                  "-fill 0xFF 0xA020000 0xA200000 "
                                  "-o %(_tbm_build_dir_)s/bin/"
                                  "tfm.hex -Intel")],
-                   "arm/corstone1000": [("%(_tbm_build_dir_)s/../platform/ext/target/arm/corstone1000/create-flash-image.sh %(_tbm_build_dir_)s/bin flash.bin")],
                    "arm/musca_s1": [("srec_cat "
                                  "%(_tbm_build_dir_)s/bin/"
                                  "bl2.bin "

lava_helper/lava_helper_configs.py

diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 0cee521..fab385b 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -126,25 +126,6 @@
     }
 }
 
-# FVP with BL1 and BL2 bootloader for Corstone1000
-fvp_corstone1000 = {
-    "templ": "fvp_corstone1000.jinja2",
-    "job_name": "fvp_corstone1000",
-    "device_type": "fvp",
-    "job_timeout": 15,
-    "action_timeout": 10,
-    "monitor_timeout": 15,
-    "poweroff_timeout": 1,
-    "platforms": {"arm/corstone1000": ""},
-    "data_bin_offset": "0x68100000",
-    "binaries": {
-        "application": "bl1.bin",
-        "data": "flash.bin"
-    },
-    "monitors": {
-        'reg_tests': [monitors_mcuboot_tests, monitors_s_reg_tests] if "FVP" in os.getenv('EXTRA_PARAMS') else [],
-    }
-}
 
 # FVP with BL2 bootloader for AN521
 # application: --application cpu0=bl2.axf
@@ -298,7 +279,6 @@
 lava_gen_config_map = {
     "mps2_an521_bl2": tfm_mps2_sse_200,
     "fvp_mps3_an552_bl2": fvp_mps3_an552_bl2,
-    "fvp_corstone1000": fvp_corstone1000,
     "fvp_mps2_an521_bl2": fvp_mps2_an521_bl2,
     "fvp_mps2_an519_bl2": fvp_mps2_an519_bl2,
     "qemu_mps2_bl2": qemu_mps2_bl2,