summaryrefslogtreecommitdiffstats
path: root/resources/scripts/helpers/build/roms
diff options
context:
space:
mode:
Diffstat (limited to 'resources/scripts/helpers/build/roms')
-rwxr-xr-xresources/scripts/helpers/build/roms/withdepthcharge6
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub3
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper7
-rwxr-xr-xresources/scripts/helpers/build/roms/withseabios4
-rwxr-xr-xresources/scripts/helpers/build/roms/withseabios_helper6
5 files changed, 12 insertions, 14 deletions
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge
index a5adc2e..d12eb53 100755
--- a/resources/scripts/helpers/build/roms/withdepthcharge
+++ b/resources/scripts/helpers/build/roms/withdepthcharge
@@ -105,12 +105,12 @@ builddepthcharge() {
cd "depthcharge/"
make distclean
- rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/depthcharge.elf"
+ rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/payload.elf"
make BOARD="${board}" defconfig
make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j${cores} depthcharge_unified
- cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/"
+ cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/payload.elf"
cd "../coreboot/${cbrevision}/${cbrevision}/"
git checkout master
@@ -171,7 +171,7 @@ buildcoreboot() {
mv "${board}/" "../../../bin/depthcharge/"
# clean this up
- rm -f "depthcharge.elf"
+ rm -f "payload.elf"
rm -f *.img
git checkout master
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index 3025d97..433ae7d 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -119,8 +119,7 @@ if [ -d "bin/grub/" ]; then
fi
# The GRUB files are no longer needed
-rm -f "coreboot/grub"*.{elf,cfg}
-rm -f "coreboot/seabios"*.elf
+rm -f "coreboot/"*.{elf,cfg}
rm -f "coreboot/"*/*/*.{elf,cfg}
printf "\n\n"
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index d518e75..f558966 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
diff --git a/resources/scripts/helpers/build/roms/withseabios b/resources/scripts/helpers/build/roms/withseabios
index 50665be..97ba69f 100755
--- a/resources/scripts/helpers/build/roms/withseabios
+++ b/resources/scripts/helpers/build/roms/withseabios
@@ -49,7 +49,7 @@ else
fi
# The SeaBIOS files are no longer needed
-rm -f "coreboot/seabios"*.{elf,cfg}
-rm -f "coreboot/"*/*/*.{elf,cfg}
+rm -f coreboot/*.{elf,cfg}
+rm -f coreboot/*/*/*.{elf,cfg}
printf "\n\n"
diff --git a/resources/scripts/helpers/build/roms/withseabios_helper b/resources/scripts/helpers/build/roms/withseabios_helper
index f710051..f5b71ac 100755
--- a/resources/scripts/helpers/build/roms/withseabios_helper
+++ b/resources/scripts/helpers/build/roms/withseabios_helper
@@ -68,7 +68,7 @@ git checkout ${branchname}
)
# Make sure to remove these first
-rm -f "seabios."*{elf,cfg}
+rm -f *{elf,cfg}
printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
@@ -98,10 +98,10 @@ do
# Build coreboot ROM image
make clean
- cp "../../../seabios/out/bios.bin.vga.elf" "seabios.elf"
+ cp "../../../seabios/out/bios.bin.vga.elf" "payload.elf"
mv "config_${romtype}" .config
make -j${cores}
- rm -f "seabios.elf"
+ rm -f "payload.elf"
mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom"
# Now add SeaVGABIOS (SeaBIOS wrapper for coreboot native video init)