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_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
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