From 137420fe9d6efc80d81f88d9be1c11e347a92cb0 Mon Sep 17 00:00:00 2001
From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
Date: Wed, 6 Dec 2023 12:39:49 +0100
Subject: [PATCH] ci/baremetal: make BM_BOOTCONFIG optional

In some cases we can have the config.txt boot file already available in
the tftp folder.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26552>
(cherry picked from commit f97e065c4f72856eccefcbf7dbe72253a6918294)
---
 .gitlab-ci/bare-metal/poe-powered.sh | 11 ++++-------
 .pick_status.json                    |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh
index 399384f..101fa60 100755
--- a/.gitlab-ci/bare-metal/poe-powered.sh
+++ b/.gitlab-ci/bare-metal/poe-powered.sh
@@ -70,11 +70,6 @@ if [ -z "$BM_CMDLINE" ]; then
   exit 1
 fi
 
-if [ -z "$BM_BOOTCONFIG" ]; then
-  echo "Must set BM_BOOTCONFIG to your board's required boot configuration arguments"
-  exit 1
-fi
-
 set -ex
 
 date +'%F %T'
@@ -154,8 +149,10 @@ date +'%F %T'
 
 echo "$BM_CMDLINE" > /tftp/cmdline.txt
 
-# Add some required options in config.txt
-printf "$BM_BOOTCONFIG" >> /tftp/config.txt
+# Add some options in config.txt, if defined
+if [ -n "$BM_BOOTCONFIG" ]; then
+  printf "$BM_BOOTCONFIG" >> /tftp/config.txt
+fi
 
 set +e
 ATTEMPTS=3
diff --git a/.pick_status.json b/.pick_status.json
index 1886593..326a7dd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4244,7 +4244,7 @@
         "description": "ci/baremetal: make BM_BOOTCONFIG optional",
         "nominated": false,
         "nomination_type": 3,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
-- 
2.7.4