From 137b5434d75352d2a0ddd56d5cc25ba59d9b0c5a Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 5 Dec 2022 00:10:07 +0000 Subject: remove logic for avoiding nonredistributable blobs the --nuke option in ifdtool will be used instead, to nuke the ME regions in specific rom sets (and cbfstool will be used to delete mrc.bin files from rom sets) the new method being implemented is heavier on disk io, but simplifies lbmk, and disk io could still be optimised in the following ways: * when copying roms from boards with ME in them, use ifdtool --nuke to get filename.rom.new, and *move* (not copy) filename.rom.new to the new destination (for use with tar) * possibly modify ifdtool to make efficient use of mmap for disk i/o; it currently loads entire roms into an allocated buffer in memory --- resources/scripts/blobs/download | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'resources/scripts/blobs') diff --git a/resources/scripts/blobs/download b/resources/scripts/blobs/download index d8933573..f1898899 100755 --- a/resources/scripts/blobs/download +++ b/resources/scripts/blobs/download @@ -7,13 +7,6 @@ board="${1}" # A shorthand for each board so as not to duplicate blobs for boards of different sizes board_short=${board%%_*mb} -# Allow adding only blobs that can be legally redistributed (ifd+gbe) -if [ "${2}" = "redistributable" ]; then - redistributable=true -else - redistributable=false -fi - Fail(){ printf "\nERROR: $@\n" exit 1 @@ -102,10 +95,8 @@ set -- "resources/coreboot/${board}/config/*" . "resources/coreboot/${board}/board.cfg" if [ "${CONFIG_HAVE_MRC}" = "y" ]; then - if [ "${redistributable}" = "false" ]; then - printf 'haswell board detected, downloading mrc\n' - needs+=" MRC" - fi + printf 'haswell board detected, downloading mrc\n' + needs+=" MRC" fi @@ -115,10 +106,8 @@ if [ "${CONFIG_HAVE_IFD_BIN}" = "y" ]; then fi if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then - if [ "${redistributable}" = "false" ]; then - printf 'board needs intel management engine\n' - needs+=" ME" - fi + printf 'board needs intel management engine\n' + needs+=" ME" fi if [ "${CONFIG_HAVE_GBE_BIN}" = "y" ]; then -- cgit v1.2.1