diff options
Diffstat (limited to 'resources/scripts/build')
| -rwxr-xr-x | resources/scripts/build/boot/roms | 7 | ||||
| -rwxr-xr-x | resources/scripts/build/boot/roms_helper | 13 | ||||
| -rwxr-xr-x | resources/scripts/build/release/deblob | 21 | 
3 files changed, 2 insertions, 39 deletions
| diff --git a/resources/scripts/build/boot/roms b/resources/scripts/build/boot/roms index 94215028..c526c268 100755 --- a/resources/scripts/build/boot/roms +++ b/resources/scripts/build/boot/roms @@ -83,12 +83,7 @@ buildrom_release() {  	board="$1"  	if [ -d "resources/coreboot/${board}/" ]; then -		./build release deblob ${board} -		if [ "$?" = 2 ]; then -			./build boot roms_helper "${board}" -		else -			./build boot roms_helper deblobbed "${board}" -		fi +		./build boot roms_helper "${board}"  	else  		die "\nbuild/roms: target not defined in the build system: %s\n" "${board}"  	fi diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 40c0f394..bd1f3860 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -30,13 +30,6 @@ set -u -e  projectname="$(cat projectname)" -if [ "${1}" = "deblobbed" ]; then -	deblobbed=true -	shift -else -	deblobbed=false -fi -  displaymodes=""  payloads=""  keyboard_layouts="" @@ -315,11 +308,7 @@ moverom() {  # expected: configs must not specify a payload  mkCoreboot() {  	cbdir="${1}" # e.g. coreboot/default -	if ${deblobbed} ; then -		cbcfgpath="${2}_deblobbed" -	else -		cbcfgpath="${2}" # e.g. resources/coreboot/x200_8mb/config/libgfxinit_txtmode -	fi +	cbcfgpath="${2}" # e.g. resources/coreboot/x200_8mb/config/libgfxinit_txtmode  	if [ ! -f "${cbcfgpath}" ]; then  		printf "\nmkCoreboot: Coreboot config '%s' does not exist. Skipping build.\n" \  			"${cbcfgpath}" diff --git a/resources/scripts/build/release/deblob b/resources/scripts/build/release/deblob deleted file mode 100755 index dcac1020..00000000 --- a/resources/scripts/build/release/deblob +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com> -# SPDX-License-Identifier: GPL-3.0-only - -board="${1}" -board_config_dir="resources/coreboot/${board}/config" -set -- "${board_config_dir}/*" -. ${1} 2>/dev/null - -if [ "${CONFIG_HAVE_MRC}" = "y" ] || [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then -	rm ${board_config_dir}/*_deblobbed -	for config in ${board_config_dir}/* ; do -		grep -v 'CONFIG_HAVE_ME_BIN\|CONFIG_ME_BIN_PATH\|CONFIG_HAVE_MRC\|CONFIG_MRC_FILE' ${config} > "${config}_deblobbed" -	done -	./blobutil download ${board} redistributable - -else -	# Quickly exits for boards requiring no blobs -	exit 2 -fi | 
