From 2bbb4c839a8224b17c7929b7ea612085d1351d20 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 8 Jul 2023 22:07:36 +0100 Subject: remove blobutil and boards/utils needing/for blobs delete all blobs. TODO: actually deblob coreboot/uboot when downloading. i'll that in a little while, in an upcoming commit. yes. purge it all, in fsf style. censor what the fsf doesn't like. so that they can feel good about having less, because ideological purity is better than helping more people use coreboot, yes? Signed-off-by: Leah Rowe --- resources/scripts/build/release/roms | 84 ------------------------------------ 1 file changed, 84 deletions(-) (limited to 'resources/scripts/build/release/roms') diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms index d81ec09a..62fe91bc 100755 --- a/resources/scripts/build/release/roms +++ b/resources/scripts/build/release/roms @@ -26,9 +26,6 @@ version="version-unknown" versiondate="version-date-unknown" cbtree="default" target="" -CONFIG_HAVE_MRC="" -CONFIG_HAVE_ME_BIN="" -CONFIG_KBC1126_FIRMWARE="" ifdtool="cbutils/${cbtree}/ifdtool" cbfstool="cbutils/${cbtree}/cbfstool" @@ -73,25 +70,6 @@ make_archive() continue fi - CONFIG_HAVE_MRC="y" - CONFIG_HAVE_ME_BIN="y" - CONFIG_KBC1126_FIRMWARE="y" - grep "CONFIG_HAVE_ME_BIN=y" \ - "resources/coreboot/${target}/config/"* \ - || CONFIG_HAVE_ME_BIN="n" - grep "CONFIG_HAVE_MRC=y" \ - "resources/coreboot/${target}/config/"* \ - || CONFIG_HAVE_MRC="n" - grep "CONFIG_KBC1126_FIRMWARE=y" \ - "resources/coreboot/${target}/config"/* \ - || CONFIG_KBC1126_FIRMWARE="n" - - # remove ME/MRC/EC firmware from ROM images - if [ "${CONFIG_HAVE_ME_BIN}" = "y" ] \ - || [ "${target}" = "e6400nvidia_4mb" ]; then - strip_archive "${romdir}" - fi - printf "Generating release/%s/roms/%s-%s_%s.tar.xz\n" \ "${version}" "${projectname}" \ "${version}" "${target##*/}" @@ -109,68 +87,6 @@ make_archive() fi } -strip_archive() -{ - romdir=${1} - - if [ ! -d coreboot/${cbtree} ]; then - ./download coreboot ${cbtree} || exit 1 - fi - ./build module cbutils ${cbtree} || exit 1 - - rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later - # rather than using /tmp, which might not be tmpfs - mkdir "${romdir}_tmp" - - # Hash the rom before removing blobs - if [ ! -f "${romdir}/blobhashes" ]; then - printf "ROMs must match these hashes after blob insertion:" \ - > "${romdir}/blobhashes" - fi - ( - cd ${romdir} || err "subshell: cd" - sha1sum *.rom >> blobhashes || err "subshell: sha1sum" - ) - - for romfile in "${romdir}"/*.rom - do - strip_rom_image "${romfile}" - done -} - -strip_rom_image() -{ - romfile=${1} - - if [ ! -f "${romfile}" ]; then - continue - fi - - if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then - ${ifdtool} --nuke me "${romfile}" || exit 1 - mv "${romfile}" "${romdir}_tmp"/ - mv "${romfile}.new" "${romfile}" - fi - - if [ "${CONFIG_HAVE_MRC}" = "y" ] - then - ${cbfstool} "${romfile}" remove -n mrc.bin || exit 1 - ${cbfstool} "${romfile}" print - fi - - if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then - ${cbfstool} "${romfile}" remove -n ecfw1.bin || exit 1 - ${cbfstool} "${romfile}" remove -n ecfw2.bin || exit 1 - fi - - # TODO: replace this board-specific hack - if [ "${target}" = "e6400nvidia_4mb" ]; then - ${cbfstool} "${romfile}" remove \ - -n "pci10de,06eb.rom" \ - || exit 1 - fi -} - err() { printf "%s: %s\n" $0 $1 -- cgit v1.2.1