aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwift Geek <swiftgeek@gmail.com>2018-11-27 10:06:34 +0000
committerGogs <gogitservice@gmail.com>2018-11-27 10:06:34 +0000
commit926f39b1581171ed1e5ae7e53e0d5757b3079d32 (patch)
treef8a9c629ef87662298debe6f823520b7a6f3c07f
parenta5d2271c474b11967e29238e9ce1bd1a1e171735 (diff)
parentb30b54937e3d8f4933a7c87eae6e992841cbb78f (diff)
downloadlibrebootfr-926f39b1581171ed1e5ae7e53e0d5757b3079d32.tar.gz
librebootfr-926f39b1581171ed1e5ae7e53e0d5757b3079d32.zip
Merge branch 'grub' of and_who/libreboot into master
-rw-r--r--projects/grub/configs/bios/config4
-rw-r--r--projects/grub/configs/bios/modules-minimal3
-rw-r--r--projects/grub/configs/coreboot/config2
-rw-r--r--projects/grub/configs/coreboot/modules-minimal1
-rw-r--r--projects/grub/configs/uefi/config2
-rw-r--r--projects/grub/configs/uefi/modules-minimal1
6 files changed, 12 insertions, 1 deletions
diff --git a/projects/grub/configs/bios/config b/projects/grub/configs/bios/config
index 9e627e2f..0b4a8d4e 100644
--- a/projects/grub/configs/bios/config
+++ b/projects/grub/configs/bios/config
@@ -1,2 +1,6 @@
+insmod cbfs
+
+set prefix=(cbfsdisk)/fallback
+
set root=(cbfsdisk)
source (cbfsdisk)/fallback/grub.cfg
diff --git a/projects/grub/configs/bios/modules-minimal b/projects/grub/configs/bios/modules-minimal
index 706aa529..6cb1d499 100644
--- a/projects/grub/configs/bios/modules-minimal
+++ b/projects/grub/configs/bios/modules-minimal
@@ -1,5 +1,4 @@
ahci
-biosdisk
cbfs
cbmemc
configfile
@@ -7,8 +6,10 @@ ehci
ext2
halt
loadenv
+memdisk
part_bsd
part_gpt
pata
reboot
+test
verify
diff --git a/projects/grub/configs/coreboot/config b/projects/grub/configs/coreboot/config
index e3792e94..0b4a8d4e 100644
--- a/projects/grub/configs/coreboot/config
+++ b/projects/grub/configs/coreboot/config
@@ -1,3 +1,5 @@
+insmod cbfs
+
set prefix=(cbfsdisk)/fallback
set root=(cbfsdisk)
diff --git a/projects/grub/configs/coreboot/modules-minimal b/projects/grub/configs/coreboot/modules-minimal
index 0480a0d0..e2033cb8 100644
--- a/projects/grub/configs/coreboot/modules-minimal
+++ b/projects/grub/configs/coreboot/modules-minimal
@@ -10,5 +10,6 @@ part_bsd
part_gpt
pata
reboot
+test
usbms
verify
diff --git a/projects/grub/configs/uefi/config b/projects/grub/configs/uefi/config
index e3792e94..0b4a8d4e 100644
--- a/projects/grub/configs/uefi/config
+++ b/projects/grub/configs/uefi/config
@@ -1,3 +1,5 @@
+insmod cbfs
+
set prefix=(cbfsdisk)/fallback
set root=(cbfsdisk)
diff --git a/projects/grub/configs/uefi/modules-minimal b/projects/grub/configs/uefi/modules-minimal
index 0480a0d0..e2033cb8 100644
--- a/projects/grub/configs/uefi/modules-minimal
+++ b/projects/grub/configs/uefi/modules-minimal
@@ -10,5 +10,6 @@ part_bsd
part_gpt
pata
reboot
+test
usbms
verify