From 873622e4ac929fc2c3927d5a3ed38930ffcdd455 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Mon, 2 Sep 2024 12:05:03 +0100
Subject: [PATCH] ci/lava: Fix fastboot tests

We changed the args without changing the tests.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30978>
---
 .../tests/data/FASTBOOT_force_uart=False_job_definition.yaml  | 4 ++--
 .../tests/data/FASTBOOT_force_uart=True_job_definition.yaml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
index b2b5ee7e1f9..c7cbf104e1d 100644
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -40,8 +40,8 @@ actions:
         image: registry.gitlab.collabora.com/lava/health-check-docker
         steps:
         - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
-        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard
-          rootwait ip=dhcp init=/init" --pagesize 4096 --base 0x80000000 -o boot.img
+        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3
+          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096 --base 0x80000000 -o boot.img
     namespace: dut
 - deploy:
     timeout:
diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
index 65b817d805e..7e50efa5509 100644
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
@@ -39,8 +39,8 @@ actions:
         image: registry.gitlab.collabora.com/lava/health-check-docker
         steps:
         - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
-        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard
-          rootwait ip=dhcp init=/init" --pagesize 4096 --base 0x80000000 -o boot.img
+        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3
+          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096 --base 0x80000000 -o boot.img
 - deploy:
     timeout:
       minutes: 2