From ad6694c0ea1165372cc4c9773bb0e46fe653e416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Thu, 4 Apr 2024 13:22:30 +0200 Subject: [PATCH 1/2] meta-lxatac-bsp: barebox: use a shellcheckrc to ignore hush errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bareboxes hush shell behaves mostly like a normal shell scripting language, but differs a bit here and there. Instead of ignoring these differences on a file-by-file basis we can instead add one central .shellcheckrc file. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/files/.shellcheckrc | 3 +++ .../recipes-bsp/barebox/files/lxatac/env/init/20_splash.sh | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 meta-lxatac-bsp/recipes-bsp/barebox/files/.shellcheckrc diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/.shellcheckrc b/meta-lxatac-bsp/recipes-bsp/barebox/files/.shellcheckrc new file mode 100644 index 00000000..6d2794b3 --- /dev/null +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/.shellcheckrc @@ -0,0 +1,3 @@ +# Barebox scripts use variables defined outside of the script and they +# assign values to variables with dots in their name. +disable=SC2154,SC2276 diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_splash.sh b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_splash.sh index 6cdf21ad..65115591 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_splash.sh +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_splash.sh @@ -3,5 +3,4 @@ # Turn the LCD on with a splash screen splash /env/data/splash.png -# shellcheck disable=SC2276 fb0.enable=1 From 2ffd5795e7e7ae782dc679ed9edc824d78253e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Thu, 4 Apr 2024 11:33:23 +0200 Subject: [PATCH 2/2] meta-lxatac-bsp: barebox: increase boot timeout when serial booting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When someone loads barebox via serial download instead of e.g. from the eMMC it is very likely that they want to upload an image via fastboot next and do not want to autoboot into linux right away. Give them a bit more time to interrupt the boot process. Signed-off-by: Leonard Göhrs --- .../barebox/files/lxatac/env/init/20_serial_timeout.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_serial_timeout.sh diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_serial_timeout.sh b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_serial_timeout.sh new file mode 100644 index 00000000..d373a77c --- /dev/null +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/env/init/20_serial_timeout.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "${bootsource}" = serial ]; then + global.autoboot_timeout=30 +fi