From d21f3c0519a7251ab32344afd590b85018d56401 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 27 Nov 2018 04:33:54 -0500
Subject: Modify modules to include and load in GRUB images

The cbfs module must be loaded before trying to source grub.cfg
from CBFS, for obvious reasons.

The test module is bundled into all images in order to avoid the
situation where grub gets stuck in a loop trying to locate the
module during parsing of grub.cfg. This could happen if a user
removes the module or moves it, so it's best to avoid a brick
by just bundling it into the image.

For the bios target, biosdisk has been removed as it doesn't seem
to provide any benefit and memdisk has been added to eliminate
an error printed by GRUB upon load.
---
 projects/grub/configs/bios/config              | 2 ++
 projects/grub/configs/bios/modules-minimal     | 3 ++-
 projects/grub/configs/coreboot/config          | 2 ++
 projects/grub/configs/coreboot/modules-minimal | 1 +
 projects/grub/configs/uefi/config              | 2 ++
 projects/grub/configs/uefi/modules-minimal     | 1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'projects/grub')

diff --git a/projects/grub/configs/bios/config b/projects/grub/configs/bios/config
index 9e627e2f..c83bd21d 100644
--- a/projects/grub/configs/bios/config
+++ b/projects/grub/configs/bios/config
@@ -1,2 +1,4 @@
+insmod cbfs
+
 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
-- 
cgit v1.2.3-70-g09d2