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>
This commit is contained in:

committed by
Marge Bot

parent
d157cd7442
commit
f97e065c4f
@@ -70,11 +70,6 @@ if [ -z "$BM_CMDLINE" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$BM_BOOTCONFIG" ]; then
|
|
||||||
echo "Must set BM_BOOTCONFIG to your board's required boot configuration arguments"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
date +'%F %T'
|
date +'%F %T'
|
||||||
@@ -180,8 +175,10 @@ date +'%F %T'
|
|||||||
|
|
||||||
echo "$BM_CMDLINE" > /tftp/cmdline.txt
|
echo "$BM_CMDLINE" > /tftp/cmdline.txt
|
||||||
|
|
||||||
# Add some required options in config.txt
|
# Add some options in config.txt, if defined
|
||||||
printf "$BM_BOOTCONFIG" >> /tftp/config.txt
|
if [ -n "$BM_BOOTCONFIG" ]; then
|
||||||
|
printf "$BM_BOOTCONFIG" >> /tftp/config.txt
|
||||||
|
fi
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
ATTEMPTS=3
|
ATTEMPTS=3
|
||||||
|
Reference in New Issue
Block a user