Skip to content

GitLab

Commit 141bd388 authored by dhivael's avatar dhivael Committed by James T. Lee
Browse files

abort autoboot with ^C, saves 1s during boot

parent 3d589c61
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
configs/pinebook-pro-rk3399_defconfig
View file @ 141bd388
...@@ -11,12 +11,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y ...@@ -11,12 +11,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
<<<<<<< HEAD CONFIG_BOOTDELAY=0
CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
=======
CONFIG_BOOTDELAY=1
>>>>>>> 2b77796279... reduce pinebook_pro bootdelay to 1
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb" CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
...@@ -96,3 +92,7 @@ CONFIG_VIDEO_ROCKCHIP=y ...@@ -96,3 +92,7 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_EDP=y CONFIG_DISPLAY_ROCKCHIP_EDP=y
CONFIG_SPL_TINY_MEMSET=y CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y CONFIG_ERRNO_STR=y
CONFIG_AUTOBOOT_PROMPT="Press q or Ctrl-C to interrupt autoboot\n"
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR="q"
CONFIG_AUTOBOOT_KEYED_CTRLC=y
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment