diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/build/roms | 19 | ||||
| -rwxr-xr-x | script/update/release | 31 | ||||
| -rwxr-xr-x | script/vendor/inject | 18 |
3 files changed, 7 insertions, 61 deletions
diff --git a/script/build/roms b/script/build/roms index 2926f297..f72b66b6 100755 --- a/script/build/roms +++ b/script/build/roms @@ -22,7 +22,7 @@ kmapdir="config/grub/keymap" pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t" pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin" v="romdir cbrom initmode displaymode cbcfg targetdir tree arch" -v="${v} grub_timeout ubdir vendorfiles board grub_scan_disk uboot_config" +v="${v} grub_timeout ubdir board grub_scan_disk uboot_config" eval "$(setvars "n" ${pv})" eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)" @@ -107,8 +107,6 @@ check_target() payload_uboot="n" [ "${payload_uboot}" = "y" ] && [ -z "${uboot_config}" ] && \ uboot_config="default" - [ "${vendorfiles}" != "n" ] && [ "${vendorfiles}" != "y" ] && \ - vendorfiles="y" # Override all payload directives with cmdline args [ -z "${_payload}" ] && return 0 @@ -401,17 +399,12 @@ mkUbootRom() { printf "%s\n" "${tmprom}" } -# it is assumed that no other work will be done on the ROM -# after calling this function. therefore this function is "final" -moverom() { - rompath="${1}" - newrom="${2}" - - [ "${vendorfiles}" = "n" ] && newrom="${newrom%.rom}_noblobs.rom" - printf "Creating target image: %s\n" "${newrom}" +moverom() +{ + printf "Creating target image: %s\n" "$2" - x_ mkdir -p "${newrom%/*}" - x_ cp "${rompath}" "${newrom}" + x_ mkdir -p "${2%/*}" + x_ cp "$1" "$2" } usage() diff --git a/script/update/release b/script/update/release index b9128328..76de4ede 100755 --- a/script/update/release +++ b/script/update/release @@ -7,8 +7,7 @@ set -u -e . "include/err.sh" . "include/option.sh" -eval "$(setvars "" vdir relname src_dirname srcdir _xm target romdir \ - microcode_required mode)" +eval "$(setvars "" vdir relname src_dirname srcdir _xm target romdir mode)" main() { @@ -133,21 +132,7 @@ handle_rom_archive() nukerom() { - microcode_required="y" . "config/coreboot/${target}/target.cfg" - if [ "${microcode_required}" != "y" ] && \ - [ "${microcode_required}" != "n" ]; then microcode_required="y"; fi - if [ "${microcode_required}" = "n" ]; then - for romfile in "${romdir}"/*.rom; do - [ -f "${romfile}" ] || continue - strip_ucode "${romfile}" - done - for romfile in "${romdir}"/*.tmprom; do - [ -f "${romfile}" ] || continue - mv "${romfile}" "${romfile%.tmprom}.rom" || \ - err "!mv romfile, nukerom" - done - fi # Hash the images before removing vendor files # which "./vendor inject" uses for verification @@ -165,20 +150,6 @@ nukerom() done } -strip_ucode() -{ - romfile=${1} - _newrom_b="${romfile%.rom}_nomicrocode.tmprom" - cp "${romfile}" "${_newrom_b}" || err "!cp romfile ${romfile}, strip_u" - microcode_present="y" - "${cbfstool}" "${_newrom_b}" remove -n \ - cpu_microcode_blob.bin 2>/dev/null || microcode_present="n" - [ "${microcode_present}" = "n" ] || return 0 - printf "REMARK: '%s' already lacks microcode\n" "${romfile}" 1>&2 - printf "Renaming default ROM file instead.\n" 1>&2 - mv "${romfile}" "${_newrom_b}" || err "!mv romfile ${romfile}, strip_u" -} - insert_copying_files() { remkdir "${1}/licenses" diff --git a/script/vendor/inject b/script/vendor/inject index b4b74bb7..1f1d0209 100755 --- a/script/vendor/inject +++ b/script/vendor/inject @@ -122,14 +122,6 @@ patch_release_roms() printf "patching rom: %s\n" "$x" patch_rom "${x}" done - for x in "${_tmpdir}"/bin/*/*_nomicrocode.rom ; do - [ -f "${x}" ] || continue - [ -f "${x%_nomicrocode.rom}.rom" ] || continue - - cp "${x%_nomicrocode.rom}.rom" "${x}" || \ - err "patch_r: !cp \"${x%_nomicrocode.rom}.rom\" \"${x}\"" - x_ "${cbfstool}" "${x}" remove -n cpu_microcode_blob.bin - done ( x_ cd "${_tmpdir}/bin/"* # TODO: very dodgy, re-write accordingly @@ -159,16 +151,6 @@ patch_rom() { rom="${1}" - # we don't process no-microcode roms; these are - # instead re-created at the end, after re-inserting - # on roms with microcode, by copying and then removing, - # so that the hashes will match (otherwise, cbfstool - # may sometimes insert certain vendor files at the wrong offset) - # (unless nomicrocode is the only config provided) - [ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \ - [ -f "${rom%_nomicrocode.rom}.rom" ] && \ - [ "${release}" = "y" ] && return 0 - check_defconfig "$boarddir" && err "patch_rom $boarddir: no configs" set -- "${boarddir}/config/"* |