From 407f70f2f5d4834297f73b76b2ef5721e66ac90e Mon Sep 17 00:00:00 2001 From: Leah Woods Date: Sat, 21 May 2016 11:13:22 +0100 Subject: All board: payload now named payload.elf --- resources/scripts/helpers/build/roms/withgrub_helper | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'resources/scripts/helpers/build/roms/withgrub_helper') diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index d518e758..f5589662 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -68,8 +68,7 @@ git checkout ${branchname} ) # Make sure to remove these first -rm -f "grub."*{elf,cfg} -rm -f "seabios"*.elf +rm -f *.{elf,cfg} printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot @@ -110,12 +109,12 @@ do make clean mv "config_${romtype}" ".config" cp "../../grub_${romtype}.elf" "grub.elf" - cp "../../../seabios/out/bios.bin.elf" "seabios.elf" + cp "../../../seabios/out/bios.bin.elf" "payload.elf" make -j${cores} mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom" # We dont need seabios.elf anymore - rm -f "seabios.elf" + rm -f "payload.elf" # Add the grub.elf to CBFS ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2 -- cgit v1.2.3-70-g09d2