From d30083a857626910c96b6c5a932e8ca724cf59c3 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Wed, 10 Mar 2021 02:29:19 +0700 Subject: [PATCH] uboot: Define timeout variable It is possible to set a timeout for automatic bootloading via a variable. --- features.in/uboot/config.mk | 2 ++ features.in/uboot/image-scripts.d/00-uboot-prepare | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/features.in/uboot/config.mk b/features.in/uboot/config.mk index d881e8a6..7356d51a 100644 --- a/features.in/uboot/config.mk +++ b/features.in/uboot/config.mk @@ -17,7 +17,9 @@ use/uboot: use/kernel/initrd-setup $(UBOOT_TTY) ifeq (,$(filter-out riscv64,$(ARCH))) @$(call add,UBOOT_BOOTARGS,earlyprintk debug no_alt_virt_keyboard) endif + @$(call try,UBOOT_TIMEOUT,50) @$(call xport,UBOOT_BOOTARGS) + @$(call xport,UBOOT_TIMEOUT) else use/uboot: ; @: endif diff --git a/features.in/uboot/image-scripts.d/00-uboot-prepare b/features.in/uboot/image-scripts.d/00-uboot-prepare index b685d051..0b0a67d1 100755 --- a/features.in/uboot/image-scripts.d/00-uboot-prepare +++ b/features.in/uboot/image-scripts.d/00-uboot-prepare @@ -11,7 +11,7 @@ cat > /boot/extlinux/extlinux.conf << EOF menu title ALTLinux Boot Options default linux -timeout 70 +timeout $GLOBAL_UBOOT_TIMEOUT label linux kernel /boot/vmlinuz