merge coreboot/u-boot download logic to one script

they are fundamentally the same, in an lbmk context.

they are downloaded in the same way, and compiled in
the same way!

(Kconfig infrastructure, board-specific code, the way
submodules are used in git, etc)

~200 sloc reduction in resources/scripts

the audit begins

Signed-off-by: Leah Rowe <leah@libreboot.org>

fetch_trees

@@ -0,0 +1,191 @@
+#!/usr/bin/env sh
+
+#  helper script: create code trees based on git revision, with patches
+#  (currently used for downloading coreboot and u-boot)
+#
+#	Copyright (C) 2014-2016,2020,2021,2023 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+#	Copyright (C) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+#
+#	This program is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+#	(at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+_target=""
+tree=""
+rev=""
+project=""
+cfgsdir=""
+
+main()
+{
+	rm -f ${cfgsdir}/*/seen
+
+	printf "Downloading %s and (if available) applying patches\n" \
+	    ${project}
+
+	[ -z "${1}" ] && err "project name not specified"
+	project="${1}"
+	cfgsdir="resources/${project}"
+	[ -d "${cfgsdir}" ] || err "unsupported project name"
+	shift 1
+
+	targets=""
+	if [ $# -gt 0 ]; then
+		targets=$@
+	else
+		for x in "${cfgsdir}/"*; do
+			[ ! -d "${x}" ] && continue
+			targets="${targets} ${x##*/}"
+		done
+	fi
+	for x in ${targets}; do
+		rm -f "${cfgsdir}"/*/seen
+		download_for_target "${x}"
+	done
+
+	rm -f ${cfgsdir}/*/seen
+}
+
+download_for_target()
+{
+	_target="${1}"
+	tree="undefined"
+	rev="undefined"
+
+	fetch_config "${_target}" || exit 1
+
+	rm -f "${cfgsdir}"/*/seen
+
+	if [ -d "${project}/${tree}" ]; then
+		printf "REMARK: download/%s %s: exists. Skipping.\n" \
+				${project} ${tree}
+		[ "${tree}" != "${1}" ] && \
+			printf "(for target: '%s}')\n" ${1}
+		return 0
+	fi
+
+	gitclone_from_upstream || exit 1
+
+	prepare_new_tree "${1}" "${tree}" "${rev}" \
+			|| exit 1
+}
+
+fetch_config()
+{
+	_target=${1}
+
+	while true; do
+		rev="undefined"
+		tree="undefined"
+
+		check_config_for_target "${_target}" || return 1
+
+		# This is to override $rev and $tree
+		. "${cfgsdir}/${_target}/target.cfg" || exit 1
+
+		if [ "${_target}" != "${tree}" ]; then
+			_target="${tree}"
+			continue
+		elif [ "${tree}" = "undefined" ]; then
+			printf "ERROR: download/%s:"
+			printf " tree name undefined for '%s\n'" \
+					${project} ${_target}
+			return 1
+		elif [ "${rev}" = "undefined" ]; then
+			printf "ERROR: download/%s:"
+			printf " commit ID undefined for '%s'\n" \
+					${project} ${_target}
+			return 1
+		else
+			break
+		fi
+	done
+}
+
+check_config_for_target()
+{
+	_target=${1}
+
+	if [ ! -f "${cfgsdir}/${_target}/target.cfg" ]; then
+		printf "ERROR: download/%s: target.cfg does not" ${project}
+		printf " exist for '%s'\n" ${_target}
+		return 1
+	elif [ -f "${cfgsdir}/${_target}/seen" ]; then
+		printf "ERROR: download/%s: logical loop:" ${project}
+		printf " '%s' target.cfg refers to another tree," ${_target}
+		printf " which ultimately refers back to '%s'." ${_target}
+		return 1
+	fi
+	touch "${cfgsdir}/${_target}/seen"
+}
+
+gitclone_from_upstream()
+{
+	[ ! -d "${project}" ] && \
+		mkdir -p "${project}"
+	[ ! -d "${project}" ] && \
+		return 1
+	[ -d "${project}/${project}" ] && \
+		return 0
+	./gitclone ${project} || \
+		return 1
+}
+
+prepare_new_tree()
+{
+	target=${1}
+	tree=${2}
+	rev=${3}
+
+	printf "Preparing %s tree: %s\n" ${project} ${tree}
+	[ "${tree}" != "${target}" ] && \
+		printf "(for target, %s)\n" "${target}"
+
+	cp -R "${project}/${project}" "${project}/${tree}" || exit 1
+	(
+	cd "${project}/${tree}" \
+		|| err "cannot cd to ${project}/${tree}"
+	git reset --hard ${rev} \
+		|| err "cannot reset ${project} revision for tree, ${tree}"
+	git submodule update --init --checkout \
+		|| err "cannot update ${project} submodules for tree, ${tree}"
+
+	for patch in ../../"${cfgsdir}"/"${tree}"/patches/*.patch; do
+		[ ! -f "${patch}" ] && \
+			continue
+		if ! git am "${patch}"; then
+			git am --abort
+			err "cannot patch ${tree}"
+		fi
+	done
+
+	# extra.sh can be used for anything
+	# but should *only* be a last resort
+	if [ -f "../../${cfgsdir}/${tree}/extra.sh" ]; then
+		"../../${cfgsdir}/${tree}/extra.sh" || \
+			err "${tree} extra.sh"
+	fi
+	)
+}
+
+err()
+{
+	printf "ERROR, %s, %s\n" $0 $1 1>&2
+	exit 1
+}
+
+main $@

resources/coreboot/cros/board.cfg

@@ -1,4 +0,0 @@
-cbtree="cros"
-arch="spaghettimonster"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"

resources/coreboot/cros/target.cfg

@@ -0,0 +1,4 @@
+tree="cros"
+arch="spaghettimonster"
+rev="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
+romtype="normal"

resources/coreboot/d510mo/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/d510mo_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/default/board.cfg

@@ -1,4 +0,0 @@
-cbtree="default"
-romtype="normal"
-cbrevision="d86260a134575b083f35103e1cd5c7c7ad883bce"
-arch="x86_64"

resources/coreboot/default/target.cfg

@@ -0,0 +1,4 @@
+tree="default"
+romtype="normal"
+rev="d86260a134575b083f35103e1cd5c7c7ad883bce"
+arch="x86_64"

resources/coreboot/e6400_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/fam15h_rdimm/target.cfg

@@ -1,6 +1,6 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
 romtype="normal"
-cbrevision="1c13f8d85c7306213cd525308ee8973e5663a3f8"
+rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
 arch="x86_64"
 payload_grub="n"
 payload_grub_withseabios="n"

resources/coreboot/fam15h_udimm/target.cfg

@@ -1,6 +1,6 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
 romtype="normal"
-cbrevision="1c13f8d85c7306213cd525308ee8973e5663a3f8"
+rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
 arch="x86_64"
 payload_grub="n"
 payload_grub_withseabios="n"

resources/coreboot/g43t-am3/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/g43t-am3_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/ga-g41m-es2l/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/gru_bob/target.cfg

@@ -1,4 +1,4 @@
-cbtree="cros"
+tree="cros"
 romtype="normal"
 arch="AArch64"
 payload_uboot="y"

resources/coreboot/gru_kevin/target.cfg

@@ -1,4 +1,4 @@
-cbtree="cros"
+tree="cros"
 romtype="normal"
 arch="AArch64"
 payload_uboot="y"

resources/coreboot/haswell/board.cfg

@@ -1,4 +0,0 @@
-cbtree="haswell"
-romtype="normal"
-cbrevision="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
-arch="x86_64"

resources/coreboot/haswell/target.cfg

@@ -0,0 +1,4 @@
+tree="haswell"
+romtype="normal"
+rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
+arch="x86_64"

resources/coreboot/hp2170p_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/hp2560p_8mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/hp2570p_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/hp8200sff_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/hp8200sff_8mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/hp8200sff_8mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/hp8300usdt_16mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/hp8300usdt_16mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/hp8470pintel_16mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/hp8470pintel_16mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/hp9470m_16mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/hp9470m_16mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/kcma-d8-rdimm_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
 romtype="d8d16sas"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/kcma-d8-rdimm_2mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
 romtype="d8d16sas"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/kcma-d8-udimm_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
 romtype="d8d16sas"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/kcma-d8-udimm_2mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
 romtype="d8d16sas"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/kfsn4-dre_1mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/kfsn4-dre_2mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
 romtype="normal"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg

@@ -0,0 +1,10 @@
+tree="fam15h_rdimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg

@@ -0,0 +1,10 @@
+tree="fam15h_rdimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/kgpe-d16-udimm_16mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/kgpe-d16-udimm_16mb/target.cfg

@@ -0,0 +1,10 @@
+tree="fam15h_udimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/kgpe-d16-udimm_2mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/kgpe-d16-udimm_2mb/target.cfg

@@ -0,0 +1,10 @@
+tree="fam15h_udimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/macbook11/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_32"
 payload_grub="y"

resources/coreboot/macbook11_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_32"
 payload_grub="y"

resources/coreboot/macbook21/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/macbook21_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/qemu_arm64_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="AArch64"
 payload_uboot="y"

resources/coreboot/qemu_x86_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/r400_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="16MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/r400_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/r400_8mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="8MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/r500_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOGBE NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t1650_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="normal"
 arch="x86_64"
 payload_seabios="y"

resources/coreboot/t400_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="16MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t400_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t400_8mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="8MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t420_8mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/t420_8mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/t420s_8mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/t420s_8mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/t430_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/t430_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/t440plibremrc_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="haswell"
+tree="haswell"
 romtype="t440p"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/t440pmrc_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="t440p"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t500_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="16MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t500_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t500_8mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="8MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/t520_8mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/t520_8mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/t530_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/t530_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/t60_16mb_intelgpu/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_32"
 payload_grub="y"

resources/coreboot/t60_intelgpu/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="i945 laptop"
 arch="x86_32"
 payload_grub="y"

resources/coreboot/w500_16mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="16MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/w500_4mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="4MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/w500_8mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="8MiB ICH9 IFD NOR flash"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/w530_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/w530_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/w541_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="haswell"
+tree="haswell"
 romtype="t440p"
 arch="x86_64"
 payload_grub="n"

resources/coreboot/w541mrc_12mb/target.cfg

@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
 romtype="t440p"
 arch="x86_64"
 payload_grub="y"

resources/coreboot/x200_16mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="16MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/x200_16mb/target.cfg

@@ -0,0 +1,10 @@
+tree="default"
+romtype="16MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/x200_4mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="4MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/x200_4mb/target.cfg

@@ -0,0 +1,10 @@
+tree="default"
+romtype="4MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/x200_8mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="8MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"

resources/coreboot/x200_8mb/target.cfg

@@ -0,0 +1,10 @@
+tree="default"
+romtype="8MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"

resources/coreboot/x220_8mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x220_8mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x230_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x230_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x230_16mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x230_16mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x230edp_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x230edp_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x230t_12mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x230t_12mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x230t_16mb/board.cfg

@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"

resources/coreboot/x230t_16mb/target.cfg

@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"

resources/coreboot/x301_16mb/board.cfg

@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="16MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"