From de7b1f248224e4e8f078d9a85befd6c84432b17d Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Thu, 29 Jun 2023 16:50:48 +0800 Subject: [PATCH 1/2] lkft-android: dragonboard-845c: improve some variables definitions set default or drop default as commented here: https://github.com/Linaro/lava-test-plans/pull/259 Signed-off-by: Yongqin Liu --- .../lkft-android/devices/dragonboard-845c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lava_test_plans/projects/lkft-android/devices/dragonboard-845c b/lava_test_plans/projects/lkft-android/devices/dragonboard-845c index 9645d537..ef49304c 100644 --- a/lava_test_plans/projects/lkft-android/devices/dragonboard-845c +++ b/lava_test_plans/projects/lkft-android/devices/dragonboard-845c @@ -5,9 +5,7 @@ {# to avoid overriding by the one definied in testcases #} {# like the one definied in testcases/boot.yaml is true by default #} {% set auto_login = false %} -{% set boot_method = boot_method|default("fastboot") %} -{% set BOOT_OS_PROMPT = ["console:/"] %} -{% set ptable = true %} +{% set boot_method = "fastboot" %} {% set pre_boot_command = false %} {% set pre_os_command = false %} {% set pre_power_command = false %} @@ -15,13 +13,14 @@ {% set reboot_reset = false %} {% set rootfs = false %} -{% set FASTBOOT_COMMANDS = [ "format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot" ] %}} - -{% set PTABLE_LABEL = PTABLE_LABEL|default("partition:0") %} +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} +{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot"]) %} {% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} {% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/101/dragonboard-845c-bootloader-ufs-aosp-101/gpt_both0.bin") %} -{% set partition_super = partition_super|default(true) %} -{% set partition_userdata = partition_userdata|default(true) %} + +{% set partition_super = true %} +{% set partition_userdata = true %} + {% if IMAGE_SUPPORTED_VENDOR_BOOT is defined and IMAGE_SUPPORTED_VENDOR_BOOT == "true" %} {% set partition_vendor_boot = true %} {% endif%} From f18254a239ecbb329d4c230b3ac2a8b7ff4d736f Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Thu, 29 Jun 2023 16:52:55 +0800 Subject: [PATCH 2/2] lkft-android: hi960-hikey: qrb5165-rb5: fix syntax drop the uncessary } after %}, but it seems do not cause problem on the generation Fixes: 249db05c9a8c ("lkft-android: add support for hikey960 device") Fixes: a0df0f6fccb5 ("lkft-android: add support for qrb5165-rb5 device") Signed-off-by: Yongqin Liu --- lava_test_plans/projects/lkft-android/devices/hi960-hikey | 2 +- lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lava_test_plans/projects/lkft-android/devices/hi960-hikey b/lava_test_plans/projects/lkft-android/devices/hi960-hikey index 1e76ec02..50041b73 100644 --- a/lava_test_plans/projects/lkft-android/devices/hi960-hikey +++ b/lava_test_plans/projects/lkft-android/devices/hi960-hikey @@ -13,7 +13,7 @@ {% set rootfs = false %} {% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format cache", "reboot bootloader"]) %}} +{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format cache", "reboot bootloader"]) %} {% set ptable = true %} {% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("prm_ptable.img") %} diff --git a/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 b/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 index 406f815e..1dde0dc2 100644 --- a/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 +++ b/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 @@ -12,7 +12,7 @@ {% set rootfs = false %} {% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot"]) %}} +{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot"]) %} {% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} {% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/qrb5165-rb5/linaro/rescue/27/rb5-bootloader-ufs-aosp-27/gpt_both0.bin") %}