From c240195d796a2c7d2a0bbda4da0c4bafc8d7b137 Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Fri, 3 Jul 2020 18:01:51 +0900 Subject: [PATCH 1/2] Update ci-box-lava-worker for 96boardsctl Signed-off-by: Masami Hiramatsu --- ci-box-lava-worker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-box-lava-worker b/ci-box-lava-worker index 38a49ce..bf77b7e 160000 --- a/ci-box-lava-worker +++ b/ci-box-lava-worker @@ -1 +1 @@ -Subproject commit 38a49cea6582bb6e9fab1c99723058454277b1c1 +Subproject commit bf77b7eb535654e7372213604e5cffff44597c14 From 3788c9610a5591d4a48077873919e82430786e99 Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Wed, 8 Jul 2020 15:35:21 +0900 Subject: [PATCH 2/2] Cleanup Akebi96 device-type config Signed-off-by: Masami Hiramatsu --- .../device-types/akebi96.jinja2 | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/overlays/lava-server/etc/lava-server/dispatcher-config/device-types/akebi96.jinja2 b/overlays/lava-server/etc/lava-server/dispatcher-config/device-types/akebi96.jinja2 index 75edae7..c468d18 100644 --- a/overlays/lava-server/etc/lava-server/dispatcher-config/device-types/akebi96.jinja2 +++ b/overlays/lava-server/etc/lava-server/dispatcher-config/device-types/akebi96.jinja2 @@ -1,28 +1,15 @@ {% extends "base-uboot.jinja2" %} -{% block body %} - -board_id: '{{ board_id|default('AKEBI96-0x0000000000000000') }}' - -{{ super() }} -{% endblock body %} - -# Platform parameters {% set console_device = console_device|default("ttyS0") %} -{% set baud_rate = baud_rate|default(115200) %} {% set base_high_limits = False %} {% if extra_kernel_args %} -{% set extra_kernel_args = "rootwait coherent_pool=2M " + extra_kernel_args %} +{% set extra_kernel_args = "rootwait " + extra_kernel_args %} {% else %} -{% set extra_kernel_args = "rootwait coherent_pool=2M" %} +{% set extra_kernel_args = "rootwait" %} {% endif %} {% set extra_nfsroot_args = ",vers=3" + extra_nfsroot_args|default('') %} -{% set booti_kernel_addr = "0x82000000" %} -{% set booti_ramdisk_addr = "0x84a00000" %} -{% set booti_dtb_addr = "0x84100000" %} - # Uboot custom settings {% set bootloader_prompt = bootloader_prompt|default("=>") %} {% set append_dtb = false %} @@ -34,7 +21,10 @@ board_id: '{{ board_id|default('AKEBI96-0x0000000000000000') }}' "tftpboot {DTB_ADDR} {DTB}"] -%} -{% set uboot_mkimage_arch = "arm64" %} {% set uboot_method_fit = false %} {% set booti_device_tree_config = "1" %} +{% set uboot_mkimage_arch = "arm64" %} +{% set booti_kernel_addr = "0x82000000" %} +{% set booti_ramdisk_addr = "0x84a00000" %} +{% set booti_dtb_addr = "0x84100000" %} {% set uboot_bootx_cmd = "booti {KERNEL_ADDR} {RAMDISK_ADDR} {DTB_ADDR}" %}