diff options
Diffstat (limited to 'resources')
30 files changed, 37 insertions, 39 deletions
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/config b/resources/libreboot/config/depthcharge/veyron_speedy/config index 673759a..8baf734 100644 --- a/resources/libreboot/config/depthcharge/veyron_speedy/config +++ b/resources/libreboot/config/depthcharge/veyron_speedy/config @@ -500,7 +500,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="depthcharge.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config index 14439cb..526b9ac 100644 --- a/resources/libreboot/config/grub/d510mo/config +++ b/resources/libreboot/config/grub/d510mo/config @@ -507,7 +507,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config index 2b6a304..1eb3f6c 100644 --- a/resources/libreboot/config/grub/ga-g41m-es2l/config +++ b/resources/libreboot/config/grub/ga-g41m-es2l/config @@ -502,7 +502,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config index ce3d877..abc6efb 100644 --- a/resources/libreboot/config/grub/kcma-d8/config +++ b/resources/libreboot/config/grub/kcma-d8/config @@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config index eabe2b4..eb414a3 100644 --- a/resources/libreboot/config/grub/kgpe-d16/config +++ b/resources/libreboot/config/grub/kgpe-d16/config @@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config index c929f91..821282a 100644 --- a/resources/libreboot/config/grub/macbook21/config +++ b/resources/libreboot/config/grub/macbook21/config @@ -511,7 +511,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config index 92065d8..17b36bb 100644 --- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config +++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config @@ -478,7 +478,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config index 8e04481..bc6e0e7 100644 --- a/resources/libreboot/config/grub/qemu_q35_ich9/config +++ b/resources/libreboot/config/grub/qemu_q35_ich9/config @@ -479,7 +479,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config index ce96a6d..44e314f 100644 --- a/resources/libreboot/config/grub/r400_16mb/config +++ b/resources/libreboot/config/grub/r400_16mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config index 78a4d03..e1070ae 100644 --- a/resources/libreboot/config/grub/r400_4mb/config +++ b/resources/libreboot/config/grub/r400_4mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config index ea840b2..e41bedb 100644 --- a/resources/libreboot/config/grub/r400_8mb/config +++ b/resources/libreboot/config/grub/r400_8mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config index 24d2413..57bb977 100644 --- a/resources/libreboot/config/grub/t400_16mb/config +++ b/resources/libreboot/config/grub/t400_16mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config index fc5eea8..d047885 100644 --- a/resources/libreboot/config/grub/t400_4mb/config +++ b/resources/libreboot/config/grub/t400_4mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config index ada220f..1015c87 100644 --- a/resources/libreboot/config/grub/t400_8mb/config +++ b/resources/libreboot/config/grub/t400_8mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config index 508ff47..42a87f8 100644 --- a/resources/libreboot/config/grub/t500_16mb/config +++ b/resources/libreboot/config/grub/t500_16mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config index 3441875..aa04a94 100644 --- a/resources/libreboot/config/grub/t500_4mb/config +++ b/resources/libreboot/config/grub/t500_4mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config index 1090e59..91b1b38 100644 --- a/resources/libreboot/config/grub/t500_8mb/config +++ b/resources/libreboot/config/grub/t500_8mb/config @@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config index 581381e..bc9e968 100644 --- a/resources/libreboot/config/grub/t60/config +++ b/resources/libreboot/config/grub/t60/config @@ -527,7 +527,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config index 9849398..29248dd 100644 --- a/resources/libreboot/config/grub/x200_16mb/config +++ b/resources/libreboot/config/grub/x200_16mb/config @@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config index 45829ed..8bcd1dd 100644 --- a/resources/libreboot/config/grub/x200_4mb/config +++ b/resources/libreboot/config/grub/x200_4mb/config @@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config index f497180..22ac118 100644 --- a/resources/libreboot/config/grub/x200_8mb/config +++ b/resources/libreboot/config/grub/x200_8mb/config @@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config index 0f0d373..88a8674 100644 --- a/resources/libreboot/config/grub/x60/config +++ b/resources/libreboot/config/grub/x60/config @@ -532,7 +532,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/seabios/kcma-d8/config b/resources/libreboot/config/seabios/kcma-d8/config index ce3d877..abc6efb 100644 --- a/resources/libreboot/config/seabios/kcma-d8/config +++ b/resources/libreboot/config/seabios/kcma-d8/config @@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/seabios/kfsn4-dre/config b/resources/libreboot/config/seabios/kfsn4-dre/config index 4cc178b..4939e17 100644 --- a/resources/libreboot/config/seabios/kfsn4-dre/config +++ b/resources/libreboot/config/seabios/kfsn4-dre/config @@ -570,7 +570,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set diff --git a/resources/libreboot/config/seabios/kgpe-d16/config b/resources/libreboot/config/seabios/kgpe-d16/config index eabe2b4..eb414a3 100644 --- a/resources/libreboot/config/seabios/kgpe-d16/config +++ b/resources/libreboot/config/seabios/kgpe-d16/config @@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="seabios.elf" +CONFIG_PAYLOAD_FILE="payload.elf" CONFIG_PAYLOAD_OPTIONS="" CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set 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) |