From fcb7f2960418d33a90ac3995c48eb46127169200 Mon Sep 17 00:00:00 2001 From: Ivan Velickovic Date: Tue, 30 Jan 2024 18:32:20 +1100 Subject: [PATCH] platforms: revert custom settings Reverts some of the changes in https://github.com/seL4/ci-actions/pull/310 that lead to unexpected side-affects. The 'Sel4testAllowSettingsOverride' prevents any default settings being applied in addition to allowing the settings to be overriden. Signed-off-by: Ivan Velickovic --- seL4-platforms/platforms.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/seL4-platforms/platforms.yml b/seL4-platforms/platforms.yml index f22c9840..2d5ec557 100644 --- a/seL4-platforms/platforms.yml +++ b/seL4-platforms/platforms.yml @@ -120,9 +120,9 @@ platforms: march: armv8a no_hw_build: true # The MaaxBoard in machine queue expects a binary image - settings: - Sel4testAllowSettingsOverride: true - ElfloaderImage: "binary" + # settings: + # Sel4testAllowSettingsOverride: true + # ElfloaderImage: "binary" IMX8MM_EVK: arch: arm @@ -225,9 +225,9 @@ platforms: req: [zcu102_2] march: armv8a # The ZCU102 in machine queue expects a binary image - settings: - Sel4testAllowSettingsOverride: true - ElfloaderImage: "binary" + # settings: + # Sel4testAllowSettingsOverride: true + # ElfloaderImage: "binary" ZYNQMP106: arch: arm