summaryrefslogtreecommitdiff
path: root/config/data
diff options
context:
space:
mode:
Diffstat (limited to 'config/data')
-rw-r--r--config/data/coreboot/mkhelper.cfg9
-rw-r--r--config/data/grub/bootorder1
-rw-r--r--config/data/grub/cfg/default.config29
-rw-r--r--config/data/grub/cfg/nvme.config300
-rw-r--r--config/data/grub/cfg/xhci.config (renamed from config/data/grub/cfg/xhci_nvme.config)12
-rw-r--r--config/data/grub/mkhelper.cfg2
-rw-r--r--[-rwxr-xr-x]config/data/grub/module/default14
-rwxr-xr-xconfig/data/grub/module/nvme164
-rwxr-xr-xconfig/data/grub/module/xhci (renamed from config/data/grub/module/xhci_nvme)15
9 files changed, 47 insertions, 499 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 485be95d..3816b373 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -5,22 +5,19 @@ url="https://github.com/coreboot/coreboot.git"
bkup_url="https://review.coreboot.org/coreboot"
makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-build_depend="seabios/build grub/default memtest86plus/default"
+build_depend="seabios/build grub/default memtest86plus/default coreboot/edk2_mrchromebox"
seavgabiosrom="elf/seabios/default/build/libgfxinit/vgabios.bin"
payload_seabios="n"
payload_memtest="n"
payload_grub="n"
-payload_grubsea="n"
initmode=""
ubootelf=""
grub_scan_disk=""
uboot_config=""
grubtree=""
-grubelf=""
-pname=""
displaymode=""
tmprom=""
newrom=""
@@ -33,5 +30,7 @@ mkhelper="$if_not_dry_build coreboot_pad_one_byte"
postmake="$if_not_dry_build mkcorebootbin"
cook_config="$if_not_dry_build cook_coreboot_config"
-
+# if mk_coreboot_with succeeds, this is set to "y"
+# and an error is shown if it's still n at the end.
+rom_prepared="n"
diff --git a/config/data/grub/bootorder b/config/data/grub/bootorder
deleted file mode 100644
index b33e1295..00000000
--- a/config/data/grub/bootorder
+++ /dev/null
@@ -1 +0,0 @@
-/rom@img/grub2
diff --git a/config/data/grub/cfg/default.config b/config/data/grub/cfg/default.config
index c454965c..9060ca08 100644
--- a/config/data/grub/cfg/default.config
+++ b/config/data/grub/cfg/default.config
@@ -55,7 +55,7 @@ if [ -f (cbfsdisk)/timeout.cfg ]; then
else
set timeout=8
fi
-set grub_scan_disk="ahci ata"
+set grub_scan_disk="nvme ahci ata"
if [ -f (cbfsdisk)/scan.cfg ]; then
source (cbfsdisk)/scan.cfg
fi
@@ -88,11 +88,17 @@ function search_grub {
for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
if [ "${1}" != "nvme" ]; then
try_user_config "(${1}${i},${part})"
+ else
+ # TODO: do we care about other namesapces
+ try_user_config "(nvme${i}n1,${part})"
fi
done
if [ "${1}" != "nvme" ]; then
# raw devices e.g. (ahci0) instead of (ahci0,1)
try_user_config "(${1}${i})"
+ else
+ # TODO: do we care about other namesapces
+ try_user_config "(nvme${i}n1)"
fi
done
echo # Insert newline
@@ -118,11 +124,17 @@ function search_isolinux {
for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
if [ "${1}" != "nvme" ]; then
try_isolinux_config "(${1}${i},${part})"
+ else
+ # TODO: see above
+ try_isolinux_config "(nvme${i}n1,${part})"
fi
done
if [ "${1}" != "nvme" ]; then
# raw devices e.g. (usb0) instead of (usb0,1)
try_isolinux_config "(${1}${i})"
+ else
+ # TODO: do we care about other namesapces
+ try_isolinux_config "(nvme${i}n1)"
fi
done
echo # Insert newline
@@ -213,6 +225,9 @@ menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI [a]' --hotkey='a'
menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE [d]' --hotkey='d' {
search_bootcfg ata
}
+menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on NVMe [e]' --hotkey='e' {
+ search_bootcfg nvme
+}
if [ -f (cbfsdisk)/grub.cfg ]; then
menuentry 'Load configuration (grub.cfg) in CBFS [t]' --hotkey='t' {
set root='(cbfsdisk)'
@@ -229,18 +244,6 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey=
fi
}
fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
diff --git a/config/data/grub/cfg/nvme.config b/config/data/grub/cfg/nvme.config
deleted file mode 100644
index 33ce3a9a..00000000
--- a/config/data/grub/cfg/nvme.config
+++ /dev/null
@@ -1,300 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2014-2016,2020-2021,2023-2025 Leah Rowe <leah@libreboot.org>
-# Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>
-
-set prefix=(memdisk)/boot/grub
-
-insmod at_keyboard
-insmod usb_keyboard
-insmod nativedisk
-insmod ehci
-insmod ohci
-insmod uhci
-insmod usb
-insmod usbms
-insmod regexp
-
-terminal_input --append at_keyboard
-terminal_input --append usb_keyboard
-terminal_output --append cbmemc
-
-# User interface overrides wherever "keystatus" is supported
-# Keep SHIFT key pressed before powering on to disable graphics
-if keystatus --shift; then
- terminal_output --append vga_text
-else
- gfxpayload=keep
- terminal_output --append gfxterm
-
- 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)
-if keystatus --ctrl; then
- serial
- terminal_input --append serial
- terminal_output --append serial
-fi
-
-# Keep ALT pressed to enable spkmodem
-if keystatus --alt; then
- terminal_output --append spkmodem
-fi
-
-
-set default="0"
-if [ -f (cbfsdisk)/timeout.cfg ]; then
- source (cbfsdisk)/timeout.cfg
-else
- set timeout=8
-fi
-set grub_scan_disk="nvme ahci ata"
-if [ -f (cbfsdisk)/scan.cfg ]; then
- source (cbfsdisk)/scan.cfg
-fi
-
-if [ -f (cbfsdisk)/keymap.gkb ]; then
- keymap (cbfsdisk)/keymap.gkb
-fi
-
-function really_try_user_config {
- set root="${1}"
-
- if [ -f /"${2}"/grub.cfg ]; then
- unset superusers
- configfile /"${2}"/grub.cfg
- fi
-}
-
-function try_user_config {
- # The @/... entries are for cases where the BTRFS filesystem is being used
- for dir in grub boot/grub @/grub @/boot/grub grub2 boot/grub2 @/grub2 @/boot/grub2 boot @/boot; do
- really_try_user_config "${1}" "${dir}"
- done
- for dir in ubuntu debian redhat; do
- really_try_user_config "${1}" "EFI/${dir}"
- done
-}
-function search_grub {
- echo -n "Attempting to load grub.cfg from '${1}' devices"
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${1}" != "nvme" ]; then
- try_user_config "(${1}${i},${part})"
- else
- # TODO: do we care about other namesapces
- try_user_config "(nvme${i}n1,${part})"
- fi
- done
- if [ "${1}" != "nvme" ]; then
- # raw devices e.g. (ahci0) instead of (ahci0,1)
- try_user_config "(${1}${i})"
- else
- # TODO: do we care about other namesapces
- try_user_config "(nvme${i}n1)"
- fi
- done
- echo # Insert newline
-}
-
-function try_isolinux_config {
- set root="${1}"
- for dir in '' /boot /EFI /@ /@/boot; do
- if [ -f "${dir}"/isolinux/isolinux.cfg ]; then
- syslinux_configfile -i "${dir}"/isolinux/isolinux.cfg
- elif [ -f "${dir}"/syslinux/syslinux.cfg ]; then
- syslinux_configfile -s "${dir}"/syslinux/syslinux.cfg
- elif [ -f "${dir}"/syslinux/extlinux.conf ]; then
- syslinux_configfile -s "${dir}"/syslinux/extlinux.conf
- elif [ -f "${dir}"/extlinux/extlinux.conf ]; then
- syslinux_configfile -s "${dir}"/extlinux/extlinux.conf
- fi
- done
-}
-function search_isolinux {
- echo "\nAttempting to parse iso/sys/extlinux config from '${1}' devices"
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${1}" != "nvme" ]; then
- try_isolinux_config "(${1}${i},${part})"
- else
- # TODO: see above
- try_isolinux_config "(nvme${i}n1,${part})"
- fi
- done
- if [ "${1}" != "nvme" ]; then
- # raw devices e.g. (usb0) instead of (usb0,1)
- try_isolinux_config "(${1}${i})"
- else
- # TODO: do we care about other namesapces
- try_isolinux_config "(nvme${i}n1)"
- fi
- done
- echo # Insert newline
-}
-function try_bootcfg {
- try_user_config "${1}"
- try_isolinux_config "${1}"
-}
-function search_bootcfg {
- search_grub "${1}"
- search_isolinux "${1}"
-}
-menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o' {
-
- for grub_disk in ${grub_scan_disk}; do
- search_bootcfg ${grub_disk}
- done
-
- # grub device enumeration is very slow, so checks are hardcoded
-
- raidvol="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9"
-
- # in practise, doing multiple redundant checks is perfectly fast
- # TODO: optimize grub itself, and use */? here for everything
-
- for vol in ${raidvol} ; do
- try_bootcfg "${vol}"
- done
-
- unset bootdev
- for grub_disk in ${grub_scan_disk}; do
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${grub_disk}" = "ahci" ]; then
- bootdev="${bootdev} (ahci${i},${part})"
- elif [ "${grub_disk}" = "ata" ]; then
- bootdev="${bootdev} (ata${i},${part})"
- elif [ "${grub_disk}" = "nvme" ]; then
- # TODO: do we care about other namesapces
- bootdev="${bootdev} (nvme${i}n1,${part})"
- fi
- done
- done
- done
-
- set pager=0
- echo -n "Attempting to unlock encrypted volumes"
- for dev in ${bootdev} ${raidvol}; do
- if cryptomount "${dev}" ; then break ; fi
- done
- set pager=1
- echo
-
- search_bootcfg crypto
-
- lvmvol=""
-
- # after cryptomount, lvm volumes might be available
- # using * is slow on some machines, but we use it here,
- # just once. in so doing, we find every lvm volume
- for vol in (*); do
- if regexp ^\\(lvm/ $vol; then
- lvmvol="${lvmvol} ${vol}"
- try_bootcfg "${vol}"
- fi
- done
-
- # user might have put luks inside lvm
- set pager=0
- echo "Attempting to unlock encrypted LVMs"
- for vol in ${lvmvol}; do
- cryptomount "$vol"
- done
- set pager=1
- echo
-
- search_bootcfg crypto
-
- true # Prevent pager requiring to accept each line instead of whole screen
-}
-
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on USB [s]' --hotkey='s' {
- search_bootcfg usb
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI [a]' --hotkey='a' {
- search_bootcfg ahci
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE [d]' --hotkey='d' {
- search_bootcfg ata
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on NVMe [e]' --hotkey='e' {
- search_bootcfg nvme
-}
-if [ -f (cbfsdisk)/grub.cfg ]; then
-menuentry 'Load configuration (grub.cfg) in CBFS [t]' --hotkey='t' {
- set root='(cbfsdisk)'
- if [ -f /grub.cfg ]; then
- configfile /grub.cfg
- fi
-}
-fi
-if [ -f (cbfsdisk)/grubtest.cfg ]; then
-menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey='t' {
- set root='(cbfsdisk)'
- if [ -f /grubtest.cfg ]; then
- configfile /grubtest.cfg
- fi
-}
-fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
-menuentry 'Poweroff [p]' --hotkey='p' {
- halt
-}
-menuentry 'Reboot [r]' --hotkey='r' {
- reboot
-}
-if [ -f (cbfsdisk)/img/memtest ]; then
-menuentry 'Load MemTest86+ [m]' --hotkey='m' {
- set root='cbfsdisk'
- chainloader /img/memtest
-}
-fi
-
-submenu 'Other [z]' --hotkey='z' {
- menuentry 'Enable default serial terminal [s]' --hotkey='s' {
- serial
- terminal_input --append serial
- terminal_output --append serial
- }
-
- menuentry 'Disable default serial terminal' {
- terminal_input --remove serial
- terminal_output --remove serial
- }
-
- menuentry 'Enable gfxterm' {
- terminal_output --append gfxterm
- terminal_output --remove vga_text
- }
- menuentry 'Disable gfxterm [g]' --hotkey='g' {
- terminal_output --remove gfxterm
- terminal_output --append vga_text
- }
-
- menuentry 'Enable spkmodem [a]' --hotkey='a' {
- terminal_output --append spkmodem
- }
-
- menuentry 'Disable spkmodem [z]' --hotkey='z' {
- terminal_output --remove spkmodem
- }
-}
diff --git a/config/data/grub/cfg/xhci_nvme.config b/config/data/grub/cfg/xhci.config
index dbcae070..f5d150a7 100644
--- a/config/data/grub/cfg/xhci_nvme.config
+++ b/config/data/grub/cfg/xhci.config
@@ -245,18 +245,6 @@ menuentry 'Load test configuration (grubtest.cfg) in CBFS [t]' --hotkey='t' {
fi
}
fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index 9e8dee58..dca4bf3d 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# can be overridden per-tree
-url="git://git.savannah.gnu.org/grub.git"
+url="https://gitlab.freedesktop.org/gnu-grub/grub.git"
bkup_url="https://codeberg.org/libreboot/grub"
bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 39030e2a..78ee52fe 100755..100644
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -33,8 +33,8 @@ configfile \
cpio \
cpio_be \
crc64 \
-crypto_cipher_mode_test \
crypto \
+crypto_cipher_mode_test \
cryptodisk \
diskfilter \
echo \
@@ -42,6 +42,7 @@ ehci \
eval \
exfat \
elf \
+extcmd \
ext2 \
fat \
functional_test \
@@ -60,6 +61,7 @@ gcry_kdf \
gcry_keccak \
gcry_md4 \
gcry_md5 \
+gcry_pubkey_dilithium \
gcry_rfc2268 \
gcry_rijndael \
gcry_rmd160 \
@@ -83,6 +85,7 @@ iorw \
iso9660 \
jpeg \
json \
+key_protector \
keylayouts \
keystatus \
linux \
@@ -102,23 +105,31 @@ mdraid09 \
mdraid09_be \
mdraid1x \
memdisk \
+memmove_bench \
memrw \
+mfa \
minicmd \
mmap \
+mpi \
+mldsa_test \
multiboot \
multiboot2 \
nativedisk \
+net \
normal \
ntfs \
+nvme \
ohci \
part_bsd \
part_dfly \
part_gpt \
part_msdos \
password \
+password_argon2 \
password_pbkdf2 \
pata \
pbkdf2 \
+pci \
pcidump \
pgp \
play \
@@ -154,6 +165,7 @@ ufs2 \
usb \
usb_keyboard \
usbms \
+virtionet \
xfs \
xzio \
zfs \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
deleted file mode 100755
index 4b832983..00000000
--- a/config/data/grub/module/nvme
+++ /dev/null
@@ -1,164 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Install modules (installed, but not automatically loaded)
-grub_install_modules=" \
-hexdump \
-newc \
-odc \
-usbserial_common \
-usbserial_ftdi \
-usbserial_pl2303 \
-usbserial_usbdebug \
-video_colors \
-"
-# Modules (and always loaded)
-grub_modules=" \
-acpi \
-ahci \
-at_keyboard \
-all_video \
-ata \
-bitmap \
-bitmap_scale \
-boot \
-bsd \
-btrfs \
-cat \
-cbfs \
-cbls \
-cbmemc \
-cbtime \
-chain \
-configfile \
-cpio \
-cpio_be \
-crc64 \
-crypto_cipher_mode_test \
-crypto \
-cryptodisk \
-diskfilter \
-echo \
-ehci \
-eval \
-exfat \
-elf \
-ext2 \
-fat \
-functional_test \
-f2fs \
-gcry_arcfour \
-gcry_blake2 \
-gcry_blowfish \
-gcry_camellia \
-gcry_cast5 \
-gcry_crc \
-gcry_des \
-gcry_dsa \
-gcry_hwfeatures \
-gcry_idea \
-gcry_kdf \
-gcry_keccak \
-gcry_md4 \
-gcry_md5 \
-gcry_rfc2268 \
-gcry_rijndael \
-gcry_rmd160 \
-gcry_rsa \
-gcry_seed \
-gcry_serpent \
-gcry_sha1 \
-gcry_sha256 \
-gcry_sha512 \
-gcry_tiger \
-gcry_twofish \
-gcry_whirlpool \
-geli \
-gfxmenu \
-gfxterm_background \
-gzio \
-hashsum \
-halt \
-help \
-iorw \
-iso9660 \
-jpeg \
-json \
-keylayouts \
-keystatus \
-linux \
-linux16 \
-loadenv \
-loopback \
-ls \
-lsacpi \
-lsmmap \
-lspci \
-luks \
-luks2 \
-argon2 \
-lvm \
-lzopio \
-mdraid09 \
-mdraid09_be \
-mdraid1x \
-memdisk \
-memrw \
-minicmd \
-mmap \
-multiboot \
-multiboot2 \
-nativedisk \
-normal \
-ntfs \
-nvme \
-ohci \
-part_bsd \
-part_dfly \
-part_gpt \
-part_msdos \
-password \
-password_pbkdf2 \
-pata \
-pbkdf2 \
-pcidump \
-pgp \
-play \
-png \
-procfs \
-pubkey \
-raid5rec \
-raid6rec \
-read \
-reboot \
-regexp \
-romfs \
-scsi \
-search \
-search_fs_file \
-search_fs_uuid \
-search_label \
-serial \
-syslinuxcfg \
-setjmp \
-setpci \
-spkmodem \
-squash4 \
-sleep \
-tar \
-test \
-true \
-uhci \
-udf \
-ufs1 \
-ufs1_be \
-ufs2 \
-usb \
-usb_keyboard \
-usbms \
-xfs \
-xzio \
-zfs \
-zfscrypt \
-zfsinfo \
-zstd \
-"
diff --git a/config/data/grub/module/xhci_nvme b/config/data/grub/module/xhci
index 616fca40..ef0991aa 100755
--- a/config/data/grub/module/xhci_nvme
+++ b/config/data/grub/module/xhci
@@ -34,8 +34,8 @@ configfile \
cpio \
cpio_be \
crc64 \
-crypto_cipher_mode_test \
crypto \
+crypto_cipher_mode_test \
cryptodisk \
diskfilter \
echo \
@@ -43,6 +43,7 @@ ehci \
eval \
exfat \
elf \
+extcmd \
ext2 \
fat \
functional_test \
@@ -61,6 +62,7 @@ gcry_kdf \
gcry_keccak \
gcry_md4 \
gcry_md5 \
+gcry_pubkey_dilithium \
gcry_rfc2268 \
gcry_rijndael \
gcry_rmd160 \
@@ -84,6 +86,7 @@ iorw \
iso9660 \
jpeg \
json \
+key_protector \
keylayouts \
keystatus \
linux \
@@ -103,12 +106,17 @@ mdraid09 \
mdraid09_be \
mdraid1x \
memdisk \
+memmove_bench \
memrw \
+mfa \
minicmd \
mmap \
+mpi \
+mldsa_test \
multiboot \
multiboot2 \
nativedisk \
+net \
normal \
ntfs \
nvme \
@@ -118,15 +126,17 @@ part_dfly \
part_gpt \
part_msdos \
password \
+password_argon2 \
password_pbkdf2 \
pata \
pbkdf2 \
+pci \
pcidump \
pgp \
play \
png \
-pubkey \
procfs \
+pubkey \
raid5rec \
raid6rec \
read \
@@ -156,6 +166,7 @@ ufs2 \
usb \
usb_keyboard \
usbms \
+virtionet \
xfs \
xzio \
zfs \
generated by cgit v1.2.1 (git 2.18.0) at 2026-09-24 20:35:38 +0000