diff options
Diffstat (limited to 'config/grub')
9 files changed, 30 insertions, 36 deletions
diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload index a405ae25..cdd6c0f0 100644 --- a/config/grub/default/config/payload +++ b/config/grub/default/config/payload @@ -26,13 +26,14 @@ else gfxpayload=keep terminal_output --append gfxterm - if [ -f (cbfsdisk)/background.png ]; then - insmod png - background_image (cbfsdisk)/background.png - elif [ -f (cbfsdisk)/background.jpg ]; then - insmod jpeg - background_image (cbfsdisk)/background.jpg - fi + for dt in cbfsdisk memdisk; do + for it in png jpg; do + if [ -f (${dt})/background.${it} ]; then + insmod ${it} + background_image (${dt})/background.${it} + fi + done + done fi # Keep CTRL pressed to enable default serial terminal (COM1 or the like) @@ -52,7 +53,7 @@ set default="0" if [ -f (cbfsdisk)/timeout.cfg ]; then source (cbfsdisk)/timeout.cfg else - set timeout=5 + set timeout=8 fi set grub_scan_disk="ahci ata" if [ -f (cbfsdisk)/scan.cfg ]; then diff --git a/config/grub/default/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/default/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch index 6ff97979..b83565fe 100644 --- a/config/grub/default/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/default/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Libreboot 20240504 release, based on coreboot. https://libreboot.org/")); ++ msg_formatted = grub_xasprintf (_("Libreboot 20240612 release, based on coreboot. https://libreboot.org/")); if (!msg_formatted) return; diff --git a/config/grub/default/target.cfg b/config/grub/default/target.cfg index fa5735e9..e6ed598b 100644 --- a/config/grub/default/target.cfg +++ b/config/grub/default/target.cfg @@ -1,5 +1,2 @@ tree="default" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" diff --git a/config/grub/nvme/config/payload b/config/grub/nvme/config/payload index f81d5930..2f9c7114 100644 --- a/config/grub/nvme/config/payload +++ b/config/grub/nvme/config/payload @@ -26,13 +26,14 @@ else gfxpayload=keep terminal_output --append gfxterm - if [ -f (cbfsdisk)/background.png ]; then - insmod png - background_image (cbfsdisk)/background.png - elif [ -f (cbfsdisk)/background.jpg ]; then - insmod jpeg - background_image (cbfsdisk)/background.jpg - fi + for dt in cbfsdisk memdisk; do + for it in png jpg; do + if [ -f (${dt})/background.${it} ]; then + insmod ${it} + background_image (${dt})/background.${it} + fi + done + done fi # Keep CTRL pressed to enable default serial terminal (COM1 or the like) @@ -52,7 +53,7 @@ set default="0" if [ -f (cbfsdisk)/timeout.cfg ]; then source (cbfsdisk)/timeout.cfg else - set timeout=5 + set timeout=8 fi set grub_scan_disk="nvme ahci ata" if [ -f (cbfsdisk)/scan.cfg ]; then diff --git a/config/grub/nvme/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/nvme/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch index 6ff97979..b83565fe 100644 --- a/config/grub/nvme/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/nvme/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Libreboot 20240504 release, based on coreboot. https://libreboot.org/")); ++ msg_formatted = grub_xasprintf (_("Libreboot 20240612 release, based on coreboot. https://libreboot.org/")); if (!msg_formatted) return; diff --git a/config/grub/nvme/target.cfg b/config/grub/nvme/target.cfg index a85c97f5..97a0deb5 100644 --- a/config/grub/nvme/target.cfg +++ b/config/grub/nvme/target.cfg @@ -1,5 +1,2 @@ tree="nvme" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" diff --git a/config/grub/xhci/config/payload b/config/grub/xhci/config/payload index 0e16ecb6..923e3551 100644 --- a/config/grub/xhci/config/payload +++ b/config/grub/xhci/config/payload @@ -27,13 +27,14 @@ else gfxpayload=keep terminal_output --append gfxterm - if [ -f (cbfsdisk)/background.png ]; then - insmod png - background_image (cbfsdisk)/background.png - elif [ -f (cbfsdisk)/background.jpg ]; then - insmod jpeg - background_image (cbfsdisk)/background.jpg - fi + for dt in cbfsdisk memdisk; do + for it in png jpg; do + if [ -f (${dt})/background.${it} ]; then + insmod ${it} + background_image (${dt})/background.${it} + fi + done + done fi # Keep CTRL pressed to enable default serial terminal (COM1 or the like) @@ -53,7 +54,7 @@ set default="0" if [ -f (cbfsdisk)/timeout.cfg ]; then source (cbfsdisk)/timeout.cfg else - set timeout=5 + set timeout=8 fi set grub_scan_disk="nvme ahci ata" if [ -f (cbfsdisk)/scan.cfg ]; then diff --git a/config/grub/xhci/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/xhci/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch index 6ff97979..b83565fe 100644 --- a/config/grub/xhci/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/xhci/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Libreboot 20240504 release, based on coreboot. https://libreboot.org/")); ++ msg_formatted = grub_xasprintf (_("Libreboot 20240612 release, based on coreboot. https://libreboot.org/")); if (!msg_formatted) return; diff --git a/config/grub/xhci/target.cfg b/config/grub/xhci/target.cfg index 34ab2d24..61ee9757 100644 --- a/config/grub/xhci/target.cfg +++ b/config/grub/xhci/target.cfg @@ -1,5 +1,2 @@ tree="xhci" rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7" -bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" -autoconfargs="--with-platform=coreboot --disable-werror" -makeargs="FS_PAYLOAD_MODULES=\"\"" |