summaryrefslogtreecommitdiffstats
path: root/resources/scripts
diff options
context:
space:
mode:
authorLeah Woods <info@minifree.org>2016-05-19 01:51:08 (EDT)
committer Leah Woods <info@minifree.org>2016-05-19 01:51:08 (EDT)
commite71577bb8ada10ff8274680674862935458305ee (patch)
treeb9cbcd643fd3213821ac099ec5797b52fb387a75 /resources/scripts
parent4ec96b04fc8ccf9164a85f05eca26e542be87d39 (diff)
downloadlibreboot-e71577bb8ada10ff8274680674862935458305ee.zip
libreboot-e71577bb8ada10ff8274680674862935458305ee.tar.gz
libreboot-e71577bb8ada10ff8274680674862935458305ee.tar.bz2
build/roms/withgrub: add grub to the ROM using add-payload, not add
Diffstat (limited to 'resources/scripts')
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper5
1 files changed, 3 insertions, 2 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 2ceae24..ac00e70 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -118,7 +118,7 @@ do
rm -f "seabios.elf"
# Add the grub.elf to CBFS
- ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f grub.elf -c lzma -n img/grub2.lzma -t raw
+ ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma grub.elf img/grub2
# we dont need that grub.elf now
rm -f "grub.elf"
@@ -129,7 +129,8 @@ do
# Add 0s delay to seabios, so that the user is not burdened by seeing
# that horrible interface that seabios has
- dd if=/dev/zero of=zero bs=1 count=1 conv=notrunc
+ rm -f zero
+ dd if=/dev/null of=zero bs=1 count=1
./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f zero -n etc/show-boot-menu -t raw
rm -f zero