diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-20 17:05:17 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-20 17:05:17 +0100 |
| commit | 40d4acbf5b2643e2b78be04a7b06eb2dbbd38b1d (patch) | |
| tree | 861956a639016817ab506dc21265ff7ce832da9a /include/fw | |
| parent | 324e46a87c299623f5c1ab34131637dfa56c7500 (diff) | |
don't build when tree=target on noconfig=n
only do if config=y. this reintroduces a hack that
i accidentally removed in the recent redesign.
grub has been changed to noconfig=y, and the files
for memdisk are now source from config/data/grub
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/fw')
| -rw-r--r-- | include/fw/rom.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fw/rom.sh b/include/fw/rom.sh index fcd2d30a..9047dd44 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -51,7 +51,7 @@ mkpayload_grub() -O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \ --fonts= --themes= --locales= --modules="$grub_modules" \ --install-modules="$grub_install_modules" \ - "/boot/grub/grub_default.cfg=${srcdir}/.config" \ + "/boot/grub/grub_default.cfg=$grubdata/cfg/$tree.config" \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; : } @@ -156,7 +156,7 @@ mkcorebootbin_real() grub_scan_disk="nvme ahci ata" [ -z "$grubtree" ] && \ grubtree="default" - grubelf="elf/grub/$grubtree/$grubtree/payload/grub.elf" + grubelf="elf/grub/$grubtree/$grubtree/noconfig/grub.elf" [ "$payload_memtest" != "y" ] && \ payload_memtest="n" |