From f679fbd359c584cf5da52724ff7884605520c8ef Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 15:00:51 +0300
Subject: u-boot-libre: Fix reproducability issue due to timezone

The checksums in tests/u-boot-libre.sha512 do not match the tarballs
generated by this script when ran on a different timezone, e.g. UTC+3.
Explicitly specify a timezone for the tar command that makes the
tarballs match the checksums.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/release/u-boot-libre | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index a871aab7..dc4f0c68 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -5,6 +5,7 @@
 #
 #	Copyright (C) 2020,2021 Leah Rowe <info@minifree.org>
 #	Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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
@@ -112,7 +113,7 @@ release_deblobbed_uboot()
 	    --format=gnu \
 	    --sort=name \
 	    --owner=0 --group=0 --numeric-owner \
-	    --mtime="1970-01-01" \
+	    --mtime="1970-01-01 UTC+01:00" \
 
 	lzip -9 --keep -vv "${tarball}"
 	xz   -9 --keep -vv "${tarball}"
-- 
cgit v1.2.1


From 89a4c2c61f00034ee031b62811c8a8cf4ba009b9 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Wed, 27 Jul 2022 18:35:02 +0200
Subject: u-boot-libre: remove nonfree firmware in drivers/dma/MCD_tasks.c

This firmware lack corresponding source code.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 resources/scripts/build/release/u-boot-libre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index dc4f0c68..6f724178 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -24,7 +24,7 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-revision="r1"
+revision="r2"
 
 supported_uboot_versions=" \
 	2021.07 \
-- 
cgit v1.2.1


From 01f61263f8933caa26a8f8e44900fb0f00fb5164 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 19:21:12 +0300
Subject: u-boot-libre: Fix releasing blob list as deblob script

The u-boot-libre release script copies the blobs list into the release
as the deblob script, presumably due to a copy-paste error. Fix it to
correctly copy the generated deblob script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/release/u-boot-libre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index 6f724178..63940dc2 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -171,7 +171,7 @@ release_uboot_deblob_script()
 	   "${destination}.xz"
 
 	install -m 755 -d "${release_version_dir}"
-	install -m 644 -T "${blobs_list}" "${destination}"
+	install -m 644 -T "${deblob_script}" "${destination}"
 
 	lzip -9 --keep -vv "${destination}"
 	xz   -9 --keep -vv "${destination}"
-- 
cgit v1.2.1


From 22b1db6980a7398dbd257265891944ecd4a4c8da Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 21:38:05 +0300
Subject: u-boot-libre: Set tar mtime to SOURCE_DATE_EPOCH or @0

The u-boot-libre tarball contents' mtimes are an unconventional value
due to timezone confusion. For reproducibility, timestamps like these
are usually set by a SOURCE_DATE_EPOCH which is respected by both
coreboot and U-Boot. Use it in the u-boot-libre release script as well,
and properly set the mtimes to the Unix epoch when it's not defined.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/release/u-boot-libre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index 63940dc2..3a6aaca6 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -113,7 +113,7 @@ release_deblobbed_uboot()
 	    --format=gnu \
 	    --sort=name \
 	    --owner=0 --group=0 --numeric-owner \
-	    --mtime="1970-01-01 UTC+01:00" \
+	    --mtime="@${SOURCE_DATE_EPOCH:-0}" \
 
 	lzip -9 --keep -vv "${tarball}"
 	xz   -9 --keep -vv "${tarball}"
-- 
cgit v1.2.1


From 8dd1a24504ac438e9a8a0826b531976d9bc72067 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 18:33:23 +0300
Subject: download/u-boot: Prepare files per board instead of per revision

The U-Boot download script is designed to help with releasing
u-boot-libre and it can only prepare a generic U-Boot v2021.07 tree.
However, we will need to build board-specific versions of U-Boot to be
able to use it as a coreboot payload effectively.

As a first step toward that, make the download script prepare per-board
copies of U-Boot v2021.07. Then, add a 'v2021.07' pseudo-board for the
u-boot-libre release script to work on.

The u-boot-libre deblob script hash ends up chaning due to copying my
author attribution from the download script, update its hash.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/release/u-boot-libre |   2 +-
 resources/scripts/download/u-boot            | 135 +++++++++++++++------------
 2 files changed, 77 insertions(+), 60 deletions(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index 3a6aaca6..39767bc5 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -102,7 +102,7 @@ release_deblobbed_uboot()
 	   "${tarball}.xz"
 
 	mkdir -p "$(dirname ${tmpdir})"
-	cp -R "u-boot/u-boot/" "${tmpdir}"
+	cp -R "u-boot/v${version}/" "${tmpdir}"
 
 	rm -rf ${tmpdir}/.git ${tmpdir}/.gitignore
 	make -C ${tmpdir} distclean
diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index bd0258c0..7bd8e86d 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -4,6 +4,7 @@
 #
 #	Copyright (C) 2014, 2015, 2016, 2020, 2021 Leah Rowe <info@minifree.org>
 #	Copyright (C) 2021 Denis 'GNUtoo' Carikli  <GNUtoo@cyberdimension.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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
@@ -32,33 +33,38 @@ deleteblobs="true"
 # This script handles the internet, and Git. Both are inherently unreliable.
 [[ -f build_error ]] && rm -f build_error
 
-# Make sure that older revision are first as code uses that order to
-# find the latest supported revision.
-supported_uboot_revisions=" \
-	v2021.07 \
-"
+list_supported_boards() {
+	for board in resources/u-boot/*; do
+		if [ -d ${board} ]; then
+			echo "${board#resources/u-boot/}"
+		fi
+	done
+}
 
 downloadfor() {
+	board="${1}"
+
+	ubtree="u-boot/${board}"
 	uboot_revision="v2021.07"
-	uboot_dir="u-boot/u-boot"
-	if [ -d "${uboot_dir}" ]; then
+	if [ -d "${ubtree}" ]; then
 	    printf \
 		"REMARK: '%s' directory already exists. Skipping setup.\n" \
-		"${uboot_dir}"
+		"${ubtree}"
 		return 0
 	fi
 
-	if [ ! -d "${uboot_dir}" ]; then
-		mkdir -p "${uboot_dir}"
+	if [ ! -d "u-boot" ]; then
+		mkdir -p "u-boot"
 	fi
 
-	if [ ! -d "${uboot_dir}" ]; then
-	    printf \
-		"ERROR: '%s' directory not created. Check file system permissions\n" \
-		"${uboot_dir}"
+	if [ ! -d "u-boot" ]; then
+		printf \
+			"ERROR: '%s' directory not created. Check file system permissions\n" \
+			"u-boot"
 		return 1
 	fi
 
+	uboot_dir="u-boot/u-boot"
 	if [ ! -d "${uboot_dir}/.git" ] && [ -d "${uboot_dir}" ]; then
 		rm -Rf "${uboot_dir}"
 	fi
@@ -84,12 +90,20 @@ downloadfor() {
 		fi
 	fi
 
-	git -C "${uboot_dir}" reset --hard ${uboot_revision} || \
+	cp -R "${uboot_dir}" "${ubtree}" || touch build_error
+	if [ -f build_error ]; then
+		printf "ERROR: %s: Unable to copy directory. Check file system permissions or free space.\n" \
+			"download/u-boot"
+		rm -Rf "${ubtree}/"
+		return 1
+	fi
+
+	git -C "${ubtree}" reset --hard ${uboot_revision} || \
 	    touch build_error
 	if [ -f build_error ]; then
 	    printf \
 		"ERROR: %s: Unable to reset to commit ID/tag '%s' for board '%s' on tree '%s'\n" \
-		"download/u-boot" "${uboot_revision}" "${1}" "${uboot_dir}"
+		"download/u-boot" "${uboot_revision}" "${1}" "${ubtree}"
 		return 1
 	fi
 }
@@ -162,53 +176,54 @@ usage()
 	printf "Usage:\n"
 	printf "\t%s                                # %s\n" \
 	       "${progname}" \
-	       "Download latest u-boot git revision and deblob it"
-	printf "\t%s [revision]                     # %s\n" \
+	       "Download and deblob u-boot for all boards"
+	printf "\t%s [board]                        # %s\n" \
 	       "${progname}" \
-	       "Download given u-boot git revision and deblob it"
+	       "Download and deblob u-boot for the given board"
 	printf "\t%s --blobs-list                   # %s\n" \
 	       "${progname}" \
-	       "Print the path of the blobs.list file for the latest supported u-boot revision"
-	printf "\t%s --blobs-list [revision]        # %s\n" \
+	       "Print the path of the generic blobs.list file"
+	printf "\t%s --blobs-list [board]           # %s\n" \
 	       "${progname}" \
-	       "Print the path of the blobs.list file for the given u-boot revision"
+	       "Print the path of the blobs.list file for the given board"
 	printf "\t%s --gen-deblob-script            # %s\n" \
 	       "${progname}" \
-	       "Print the path of the generated deblob script for the latest supported u-boot revision"
-	printf "\t%s --gen-deblob-script [revision] # %s\n" \
+	       "Print the path of a generated generic deblob script"
+	printf "\t%s --gen-deblob-script [board]    # %s\n" \
 	       "${progname}" \
-	       "Print the path of the generated deblob script for the given u-boot revision"
-	printf "\t%s --list-revisions               # %s\n" \
+	       "Print the path of a generated deblob script for the given board"
+	printf "\t%s --list-boards                  # %s\n" \
 	       "${progname}" \
-	       "List supported u-boot revisions"
+	       "List supported boards"
 	printf "\t%s --help                         # %s\n" \
 	       "${progname}" \
 	       "Prints this help"
 }
 
-download_uboot_revision()
+download_uboot_board()
 {
-	git_revision="$1"
+	board="${1}"
+	ubtree="u-boot/${board}"
 
 	printf "Downloading u-boot "
 	printf "and (if exist in build system) applying patches\n"
-	downloadfor "${git_revision}"
+	downloadfor "${board}"
 
 	rm -f "build_error"
 	printf "\n\n"
 
 	if [ "${deleteblobs}" = "true" ]; then
-		blobslist="resources/u-boot/default/blobs.list"
+		blobslist="$(print_blobs_list_path "${board}")"
 		for blob_path in $(strip_comments "${blobslist}"); do
 		    if echo "${blob_path}" | \
 			    grep '/$' 2>&1 >/dev/null ; then
 				printf "Deleting blob directory: '%s/%s'\n" \
-				       "${uboot_dir}" "${blob_path}"
-				rm -rf "${uboot_dir}/${blob_path}"
+				       "${ubtree}" "${blob_path}"
+				rm -rf "${ubtree}/${blob_path}"
 			else
 				printf "Deleting blob file: '%s/%s'\n" \
-				       "${uboot_dir}" "${blob_path}"
-				rm -f "${uboot_dir}/${blob_path}"
+				       "${ubtree}" "${blob_path}"
+				rm -f "${ubtree}/${blob_path}"
 			fi
 		done
 	fi
@@ -216,72 +231,74 @@ download_uboot_revision()
 
 print_blobs_list_path()
 {
-	printf "resources/u-boot/default/blobs.list\n"
+	board="$1"
+
+	if [ -f "resources/u-boot/${board}/blobs.list" ]; then
+		printf "resources/u-boot/${board}/blobs.list\n"
+	else
+		printf "resources/u-boot/default/blobs.list\n"
+	fi
 }
 
 print_deblob_script_path()
 {
-	version="$1"
+	board="$1"
 	path="$(mktemp)"
 
-	generate_deblob_script "$(print_blobs_list_path ${version})" "${path}"
+	generate_deblob_script "$(print_blobs_list_path ${board})" "${path}"
 	printf "%s\n" ${path}
 }
 
 if [ $# -eq 0 ] ; then
-	latest_revision="$(echo ${supported_uboot_revisions} | tail -n1)"
-	download_uboot_revision "${latest_revision}"
+	for board in $(list_supported_boards); do
+		download_uboot_board "${board}"
+	done
 	exit 0
 elif [ $# -eq 1 -a "$1" == "--help" ] ; then
 	usage
 	exit 0
-elif [ $# -eq 1 -a "$1" == "--list-revisions" ] ; then
-	for revision in ${supported_uboot_revisions} ; do
-		printf "${revision}\n"
-	done
+elif [ $# -eq 1 -a "$1" == "--list-boards" ] ; then
+	list_supported_boards
 	exit 0
 elif [ $# -eq 1 -a "$1" == "--blobs-list" ] ; then
-	latest_revision="$(echo ${supported_uboot_revisions} | tail -n1)"
-	print_blobs_list_path "${latest_revision}"
+	print_blobs_list_path "default"
 	exit 0
 elif [ $# -eq 2 -a "$1" == "--blobs-list" ] ; then
 	found=0
-	for revision in ${supported_uboot_revisions} ; do
-		if [ "${revision}" = "$2" ] ; then
+	for board in $(list_supported_boards) ; do
+		if [ "${board}" = "$2" ] ; then
 			print_blobs_list_path "$2"
 			exit 0
 		fi
 	done
 
-	printf "Error: Revision '${1}' is not supported\n"
+	printf "Error: Board '${2}' is not supported\n"
 
 	exit 1
 elif [ $# -eq 1 -a "$1" == "--gen-deblob-script" ] ; then
-	latest_revision="$(echo ${supported_uboot_revisions} | tail -n1)"
-	print_deblob_script_path "${latest_revision}"
+	print_deblob_script_path "default"
 	exit 0
 elif [ $# -eq 2 -a "$1" == "--gen-deblob-script" ] ; then
 	found=0
-	for revision in ${supported_uboot_revisions} ; do
-		if [ "${revision}" = "$2" ] ; then
+	for board in $(list_supported_boards) ; do
+		if [ "$board" = "$2" ] ; then
 			print_deblob_script_path "$2"
 			exit 0
 		fi
 	done
 
-	printf "Error: Revision '${1}' is not supported\n"
+	printf "Error: Board '${2}' is not supported\n"
 
 	exit 1
 elif [ $# -eq 1 ] ; then
-	found=0
-	for revision in ${supported_uboot_revisions} ; do
-		if [ "${revision}" = "$1" ] ; then
-			download_uboot_revision "$1"
+	for board in $(list_supported_boards) ; do
+		if [ "$board" = "$1" ] ; then
+			download_uboot_board "$1"
 			exit 0
 		fi
 	done
 
-	printf "Error: Revision '${1}' is not supported\n"
+	printf "Error: Board '${1}' is not supported\n"
 
 	exit 1
 fi
-- 
cgit v1.2.1


From 7b552bd29992e423755e0306ea115f726854cbf0 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 20:07:27 +0300
Subject: download/u-boot: Support reading tree and revision from board.cfg

Boards may want to specify a board-specific U-Boot revision. At the very
least, pseudo-boards for u-boot-libre releases will need to specify their
U-Boot versions somehow.

Copy the existing mechanism from download/coreboot for specifying
build info with board.cfg files. Specify the commit hash for the
'v2021.07' pseudo-board, and 'master' as the default.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 58 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 4 deletions(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 7bd8e86d..ecd35adc 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -44,12 +44,62 @@ list_supported_boards() {
 downloadfor() {
 	board="${1}"
 
-	ubtree="u-boot/${board}"
-	uboot_revision="v2021.07"
+	# The loop will always exit, but this while loop is crafted
+	# such that a tree referencing a tree that references another tree is possible
+	# (and so on)
+	while true; do
+		ubrevision="undefined"
+		ubtree="undefined"
+
+		if [ ! -f "resources/u-boot/${board}/board.cfg" ]; then
+			printf "ERROR: %s: board.cfg does not exist for '%s'\n" \
+				"download/u-boot" "${board}"
+			return 1
+		fi
+
+		if [ -f "resources/u-boot/${board}/seen" ]; then
+			printf "ERROR: %s: logical loop; '%s' board.cfg refers to another tree, which ultimately refers back to '%s'.\n" \
+				"download/u-boot" "${board}" "${board}"
+			return 1
+		fi
+
+		# This is to override $ubrevision and $ubtree
+		source "resources/u-boot/${board}/board.cfg" || touch build_error
+		if [ -f build_error ]; then
+			printf "ERROR: %s: problem sourcing %s/board.cfg\n" \
+				"download/u-boot" "${board}"
+			return 1
+		fi
+		touch "resources/u-boot/${board}/seen"
+
+		if [ "${board}" != "${ubtree}" ]; then
+			board="${ubtree}"
+		else
+			if [ "${ubtree}" = "undefined" ]; then
+				printf "ERROR: %s: tree name undefined for '%s\n'" \
+					"download/u-boot" "${board}"
+				return 1
+			fi
+
+			if [ "${ubrevision}" = "undefined" ]; then
+				printf "ERROR: %s: commit ID undefined for '%s'\n" \
+					"download/u-boot" "${board}"
+				return 1
+			fi
+			break
+		fi
+	done
+
+	rm -f resources/u-boot/*/seen
+
+	ubtree="u-boot/${ubtree}"
 	if [ -d "${ubtree}" ]; then
 	    printf \
 		"REMARK: '%s' directory already exists. Skipping setup.\n" \
 		"${ubtree}"
+		if [ "${ubtree}" != "u-boot/${board}" ]; then
+			printf "(for board: '${board}')\n"
+		fi
 		return 0
 	fi
 
@@ -98,12 +148,12 @@ downloadfor() {
 		return 1
 	fi
 
-	git -C "${ubtree}" reset --hard ${uboot_revision} || \
+	git -C "${ubtree}" reset --hard ${ubrevision} || \
 	    touch build_error
 	if [ -f build_error ]; then
 	    printf \
 		"ERROR: %s: Unable to reset to commit ID/tag '%s' for board '%s' on tree '%s'\n" \
-		"download/u-boot" "${uboot_revision}" "${1}" "${ubtree}"
+		"download/u-boot" "${ubrevision}" "${board}" "${ubtree}"
 		return 1
 	fi
 }
-- 
cgit v1.2.1


From 0aeb69b5ad276f4ca466e8a9aff203f004e32bf7 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 20:26:44 +0300
Subject: download/u-boot: Use GitHub mirror as fallback

The coreboot download script uses GitHub as a fallback if the upstream
coreboot is unavailable, use a similar fallback for U-Boot as well.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index ecd35adc..4e5a77c0 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -124,6 +124,12 @@ downloadfor() {
 		git clone https://source.denx.de/u-boot/u-boot.git \
 		    "${uboot_dir}" || \
 		    rm -Rf "${uboot_dir}"
+		if [ ! -d "${uboot_dir}" ]; then
+			printf "WARNING: Upstream failed. Trying backup github repository:\n"
+			git clone https://github.com/u-boot/u-boot.git \
+				"${uboot_dir}" || \
+				rm -Rf coreboot
+		fi
 		if [ ! -d "${uboot_dir}" ]; then
 		    printf \
 			"ERROR: %s: Problem with git-clone. Network issue?\n" \
-- 
cgit v1.2.1


From 454364ccb8c14738f88b7b51c26258c548a17305 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 20:28:22 +0300
Subject: download/u-boot: Try to update submodules as in coreboot script

The coreboot download script tries to update submodules, since coreboot
does use git submodules to retrieve and compile the projects it depends
on. Although U-Boot doesn't use submodules, try to update them anyway to
match the coreboot download script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 4e5a77c0..86be55b9 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -162,6 +162,13 @@ downloadfor() {
 		"download/u-boot" "${ubrevision}" "${board}" "${ubtree}"
 		return 1
 	fi
+
+	git -C "${ubtree}" submodule update --init || touch build_error
+	if [ -f build_error ]; then
+		printf "ERROR: %s: Unable to update submodules for tree '%s'\n" \
+			"${ubtree}"
+		return 1
+	fi
 }
 
 strip_comments()
-- 
cgit v1.2.1


From eae6b35dabdeba336aaa3ecc3fdc22a23b16d98a Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 20:31:37 +0300
Subject: download/u-boot: Support applying patches from board dirs

Boards may need different sets of patches to be applied to their U-Boot
builds, copy the existing mechanism from the coreboot download script to
the U-Boot download script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 86be55b9..212a5a21 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -169,6 +169,20 @@ downloadfor() {
 			"${ubtree}"
 		return 1
 	fi
+
+	for patch in resources/u-boot/${board}/patches/*.patch; do
+		if [ ! -f "${patch}" ]; then
+			continue
+		fi
+
+		git -C "${ubtree}" am "$(pwd)/${patch}" || touch build_error
+		if [ -f build_error ]; then
+			printf "ERROR: %s: Unable to apply patch '%s' for board '%s' on tree '%s'" \
+				"download/u-boot" "${patch}" "${board}" "${ubtree}"
+			git -C "${ubtree}" am --abort
+			return 1
+		fi
+	done
 }
 
 strip_comments()
-- 
cgit v1.2.1


From 820b8e706eb42b8f7138c16bc17cf6b6eba26a09 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 20:32:40 +0300
Subject: download/u-boot: Support running extra commands from board dirs

Although it's unlikely, boards might want to run extra commands after
the board-specific U-Boot directories are prepared. Copy the existing
mechanism for that from the coreboot download script to the U-Boot one.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 212a5a21..025ff66e 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -183,6 +183,21 @@ downloadfor() {
 			return 1
 		fi
 	done
+
+	# extra.sh could be used to patch submodules, if you wanted to
+	# It's impossible to predict what submodules will be available, and
+	# it's rare that you'd want to patch them, so this is handled by
+	# extra.sh on a per-board basis
+	# In fact, extra.sh can be used for anything you want.
+	if [ -f "resources/u-boot/${board}/extra.sh" ]; then
+		"resources/u-boot/${board}/extra.sh" || touch build_error
+		if [ -f build_error ]; then
+			return 1
+		fi
+		return 0
+	else
+		return 0
+	fi
 }
 
 strip_comments()
-- 
cgit v1.2.1


From 270272eb61083f0bfa3d3899fe1dc62718123028 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Sat, 27 Aug 2022 15:11:19 +0300
Subject: download/u-boot: Remove .git folders as well

The coreboot download removes .git folders as they still contain the
removed blobs, remove those in the U-Boot version as well.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/u-boot | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 025ff66e..b1a42b58 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -305,6 +305,7 @@ download_uboot_board()
 	printf "\n\n"
 
 	if [ "${deleteblobs}" = "true" ]; then
+		rm -rf "${ubtree}"/.git* "${ubtree}"/*/.git*
 		blobslist="$(print_blobs_list_path "${board}")"
 		for blob_path in $(strip_comments "${blobslist}"); do
 		    if echo "${blob_path}" | \
@@ -345,6 +346,11 @@ if [ $# -eq 0 ] ; then
 	for board in $(list_supported_boards); do
 		download_uboot_board "${board}"
 	done
+
+	if [ "${deleteblobs}" = "true" ]; then
+		rm -rf u-boot/u-boot/ u-boot/.git*
+	fi
+
 	exit 0
 elif [ $# -eq 1 -a "$1" == "--help" ] ; then
 	usage
@@ -390,6 +396,10 @@ elif [ $# -eq 1 ] ; then
 		fi
 	done
 
+	if [ "${deleteblobs}" = "true" ]; then
+		rm -rf u-boot/u-boot/ u-boot/.git*
+	fi
+
 	printf "Error: Board '${1}' is not supported\n"
 
 	exit 1
-- 
cgit v1.2.1


From 764a439a8cbad7d55455494f025f3e77c9fa52c0 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 25 Aug 2022 21:59:16 +0300
Subject: u-boot-libre: Add support for deblobbing U-Boot v2022.07

Add a 'v2022.07' pseudo-board for the U-Boot download script with the
default blobs list, and mark the version as supported in u-boot-libre
release script.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/release/u-boot-libre | 1 +
 1 file changed, 1 insertion(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre
index 39767bc5..8e0ce17c 100755
--- a/resources/scripts/build/release/u-boot-libre
+++ b/resources/scripts/build/release/u-boot-libre
@@ -28,6 +28,7 @@ revision="r2"
 
 supported_uboot_versions=" \
 	2021.07 \
+	2022.07 \
 "
 
 topdir="$(realpath $(dirname $(realpath $0))/../../../../)"
-- 
cgit v1.2.1


From ef39e05bb5df505774b42a8739c3e7e57d43dd36 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Sat, 27 Aug 2022 15:27:48 +0300
Subject: download: Allow keeping .git dirs with NODELETE=git

Keeping the git repositories is useful while development, e.g. to avoid
git cloning repositories over and over again while debugging download
scripts. Setting the NODELETE environment variable keeps the blobs and
the git repositories. Allow a slightly finer-tuned version of this where
we can keep only the git-related files by setting the variable to "git".

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/coreboot | 15 +++++++++++----
 resources/scripts/download/u-boot   | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/coreboot b/resources/scripts/download/coreboot
index 21fe0781..965c00f6 100755
--- a/resources/scripts/download/coreboot
+++ b/resources/scripts/download/coreboot
@@ -3,6 +3,7 @@
 #  helper script: download coreboot
 #
 #	Copyright (C) 2014, 2015, 2016, 2020, 2021 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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
@@ -64,8 +65,12 @@ fi
 # set this when you want to modify each coreboot tree
 # for example, you want to test custom patches
 # NODELETE= ./download coreboot
+deletegit="true"
 deleteblobs="true"
-[ "x${NODELETE+set}" = 'xset' ] && deleteblobs="false"
+if [ "x${NODELETE+set}" = 'xset' ]; then
+	[ "x${NODELETE:-all}" = "xgit" ] && deletegit="false"
+	[ "x${NODELETE:-all}" = "xall" ] && deleteblobs="false" && deletegit="false"
+fi
 
 # Error handling is extreme in this script.
 # This script handles the internet, and Git. Both are inherently unreliable.
@@ -239,9 +244,11 @@ rm -f resources/coreboot/*/seen
 rm -f "build_error"
 printf "\n\n"
 if [ "${deleteblobs}" = "true" ]; then
-	rm -Rf coreboot/coreboot/
-	rm -Rf coreboot/.git* coreboot/*/.git* coreboot/*/3rdparty/*/.git*
-	rm -Rf coreboot/*/util/nvidia/cbootimage/.git*
+	if [ "${deletegit}" = "true" ]; then
+		rm -Rf coreboot/coreboot/
+		rm -Rf coreboot/.git* coreboot/*/.git* coreboot/*/3rdparty/*/.git*
+		rm -Rf coreboot/*/util/nvidia/cbootimage/.git*
+	fi
 	for cbdir in coreboot/*; do
 		if [ ! -d "${cbdir}" ]; then continue; fi
 		cbtree="${cbdir##coreboot/}"
diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index b1a42b58..2e086337 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -25,9 +25,13 @@ set -u -e
 
 # set this when you want to modify each u-boot tree
 # for example, you want to test custom patches
-# NODELETE= ./download coreboot
+# NODELETE= ./download u-boot
+deletegit="true"
 deleteblobs="true"
-[ "x${NODELETE+set}" = 'xset' ] && deleteblobs="false"
+if [ "x${NODELETE+set}" = 'xset' ]; then
+	[ "x${NODELETE:-all}" = "xgit" ] && deletegit="false"
+	[ "x${NODELETE:-all}" = "xall" ] && deleteblobs="false" && deletegit="false"
+fi
 
 # Error handling is extreme in this script.
 # This script handles the internet, and Git. Both are inherently unreliable.
@@ -305,7 +309,9 @@ download_uboot_board()
 	printf "\n\n"
 
 	if [ "${deleteblobs}" = "true" ]; then
-		rm -rf "${ubtree}"/.git* "${ubtree}"/*/.git*
+		if [ "${deletegit}" = "true" ]; then
+			rm -rf "${ubtree}"/.git* "${ubtree}"/*/.git*
+		fi
 		blobslist="$(print_blobs_list_path "${board}")"
 		for blob_path in $(strip_comments "${blobslist}"); do
 		    if echo "${blob_path}" | \
@@ -347,7 +353,7 @@ if [ $# -eq 0 ] ; then
 		download_uboot_board "${board}"
 	done
 
-	if [ "${deleteblobs}" = "true" ]; then
+	if [ "${deletegit}" = "true" ]; then
 		rm -rf u-boot/u-boot/ u-boot/.git*
 	fi
 
@@ -396,7 +402,7 @@ elif [ $# -eq 1 ] ; then
 		fi
 	done
 
-	if [ "${deleteblobs}" = "true" ]; then
+	if [ "${deletegit}" = "true" ]; then
 		rm -rf u-boot/u-boot/ u-boot/.git*
 	fi
 
-- 
cgit v1.2.1


From cf295741650aaffcb03866ab15a0c7175c3dc882 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Sat, 27 Aug 2022 16:39:47 +0300
Subject: download: Use shallow clones for big projects

Downloading coreboot and U-Boot takes quite the disk space and bandwith.
We don't need to download entire repos, only the revisions that we are
interested in.

Use the --depth=1 option to only download the files we need. Since the
initial clones may not have our target revision, always try to fetch it.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/download/coreboot | 18 +++++++++---------
 resources/scripts/download/u-boot   | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/download/coreboot b/resources/scripts/download/coreboot
index 965c00f6..80fff097 100755
--- a/resources/scripts/download/coreboot
+++ b/resources/scripts/download/coreboot
@@ -152,21 +152,21 @@ downloadfor() {
 
 	if [ ! -d coreboot ]; then
 		printf "Download coreboot from upstream:\n"
-		git clone https://review.coreboot.org/coreboot || rm -Rf coreboot
+		git clone --depth=1 https://review.coreboot.org/coreboot || rm -Rf coreboot
 		if [ ! -d coreboot ]; then
 			printf "WARNING: Upstream failed. Trying backup github repository:\n"
-			git clone https://github.com/coreboot/coreboot.git || rm -Rf coreboot
+			git clone --depth=1 https://github.com/coreboot/coreboot.git || rm -Rf coreboot
 		fi
 		if [ ! -d coreboot ]; then 
 			printf "ERROR: download/coreboot: Problem with git-clone. Network issue?\n"
 			cd ../; return 1
 		fi
-	else
-		( cd coreboot/; git pull || touch ../build_error )
-		if [ -f ../build_error ]; then
-			printf "ERROR: download/coreboot: Problem with git-pull. Network issue?\n"
-			cd ../; return 1
-		fi
+	fi
+
+	( cd coreboot/; git fetch --depth=1 origin "${cbrevision}" || touch ../build_error )
+	if [ -f ../build_error ]; then
+		printf "ERROR: download/coreboot: Problem with git-fetch. Network issue?\n"
+		cd ../; return 1
 	fi
 
 	cp -R coreboot "${cbtree}" || touch ../build_error
@@ -184,7 +184,7 @@ downloadfor() {
 		cd ../../; return 1
 	fi
 
-	git submodule update --init || touch ../../build_error
+	git submodule update --init --depth=1 || touch ../../build_error
 	if [ -f ../../build_error ]; then
 		printf "ERROR: download/coreboot: Unable to update submodules for tree '%s'\n" "${cbtree}"
 		cd ../../; return 1
diff --git a/resources/scripts/download/u-boot b/resources/scripts/download/u-boot
index 2e086337..5fc80868 100755
--- a/resources/scripts/download/u-boot
+++ b/resources/scripts/download/u-boot
@@ -125,12 +125,12 @@ downloadfor() {
 
 	if [ ! -d "${uboot_dir}" ]; then
 		printf "Download u-boot from upstream:\n"
-		git clone https://source.denx.de/u-boot/u-boot.git \
+		git clone --depth=1 https://source.denx.de/u-boot/u-boot.git \
 		    "${uboot_dir}" || \
 		    rm -Rf "${uboot_dir}"
 		if [ ! -d "${uboot_dir}" ]; then
 			printf "WARNING: Upstream failed. Trying backup github repository:\n"
-			git clone https://github.com/u-boot/u-boot.git \
+			git clone --depth=1 https://github.com/u-boot/u-boot.git \
 				"${uboot_dir}" || \
 				rm -Rf coreboot
 		fi
@@ -140,14 +140,14 @@ downloadfor() {
 			"download/u-boot"
 			return 1
 		fi
-	else
-		git -C "${uboot_dir}" pull || touch build_error
-		if [ -f build_error ]; then
-		    printf \
-			"ERROR: %s: Problem with git-pull. Network issue?\n" \
-			"download/u-boot"
-			return 1
-		fi
+	fi
+
+	git -C "${uboot_dir}" fetch --depth=1 origin "${ubrevision}" || touch build_error
+	if [ -f build_error ]; then
+	    printf \
+		"ERROR: %s: Problem with git-fetch. Network issue?\n" \
+		"download/u-boot"
+		return 1
 	fi
 
 	cp -R "${uboot_dir}" "${ubtree}" || touch build_error
@@ -167,7 +167,7 @@ downloadfor() {
 		return 1
 	fi
 
-	git -C "${ubtree}" submodule update --init || touch build_error
+	git -C "${ubtree}" submodule update --init --depth=1 || touch build_error
 	if [ -f build_error ]; then
 		printf "ERROR: %s: Unable to update submodules for tree '%s'\n" \
 			"${ubtree}"
-- 
cgit v1.2.1


From 1dc05e4066c4984df4a16e17177cb0e4b26bab7b Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Fri, 26 Aug 2022 13:27:23 +0300
Subject: build/payload: Add helper script to build U-Boot as payload

This enables building U-Boot for boards which have config files in
resources/u-boot, and copying built files that could be usable to make
coreboot payloads. Right now, there is no such board in this repo.

The most important file here is "u-boot.elf", which is a combination of
the U-Boot binary and the appropriate device-tree file for the board.
Building this needs CONFIG_REMAKE_ELF=y on the U-Boot part, and using
this with CONFIG_PAYLOAD_ELF=y on the coreboot build works fine.

Note that this isn't enough to make U-Boot-only releases, since
low-level prerequisites like arm-trusted-firmware aren't passed in to
the U-Boot build system. Coreboot builds its own copy of TF-A and sets
it up on the board, so using these U-Boot builds as payloads should
still work.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/payload/u-boot | 146 +++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100755 resources/scripts/build/payload/u-boot

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/payload/u-boot b/resources/scripts/build/payload/u-boot
new file mode 100755
index 00000000..6c94a441
--- /dev/null
+++ b/resources/scripts/build/payload/u-boot
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+
+#  helper script: builds U-Boot source code
+#
+#	Copyright (C) 2020, 2021 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2021 Vitali64 <vitali64pmemail@protonmail.com>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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
+
+RET=0
+
+# Build U-Boot
+# ---------------------------------------------------------------------
+
+printf "Building U-Boot payloads\n"
+
+# Build for all boards if no argument is given
+if [ "$#" -eq 0 ]; then
+	for board_dir in resources/u-boot/*; do
+		if [ -d "${board_dir}/config/" ]; then
+			set -- "$@" "${board_dir#resources/u-boot/}"
+		fi
+	done
+fi
+
+[ ! -d "payload/" ] && mkdir -p payload/
+[ ! -d "payload/u-boot" ] && mkdir -p payload/u-boot/
+
+# Appends additional version info to U-Boot
+our_version="$(cat version)"
+projectname="$(cat projectname)"
+export LOCALVERSION="-${projectname}-${our_version}"
+
+for board in "$@"; do
+	board_dir="resources/u-boot/${board}"
+	rm -rf "payload/u-boot/${board}"
+	mkdir -p "payload/u-boot/${board}"
+
+	ubtree="undefined"
+	arch="undefined"
+
+	if [ ! -f "${board_dir}/board.cfg" ]; then
+		printf "%s: Target %s does not have a board.cfg. Skipping build.\n" \
+			"build/payload/u-boot" "${board}"
+		RET=1
+		continue
+	fi
+
+	# Override the above defaults using board.cfg
+	source "${board_dir}/board.cfg"
+
+	if [ "${ubtree}" = "undefined" ]; then
+		printf "%s: Target %s does not define a U-Boot tree. Skipping build.\n" \
+			"build/payload/u-boot" "${board}"
+		RET=1
+		continue
+	fi
+	if [ "${arch}" = "undefined" ]; then
+		printf "%s: Target %s does not define a CPU type. Skipping build.\n" \
+			"build/payload/u-boot" "${board}"
+		RET=1
+		continue
+	fi
+
+	ubdir="u-boot/${board}"
+	if [ "${board}" != "${ubtree}" ]; then
+		ubdir="u-boot/${ubtree}"
+	fi
+
+	if [ ! -d "${ubdir}" ]; then
+		./download u-boot "$board"
+	fi
+
+	if [ ! -d "${ubdir}" ]; then
+		printf "%s: Failed to download U-Boot for target %s. Skipping build.\n" \
+			"build/payload/u-boot" "${board}"
+		RET=1
+		continue
+	fi
+
+	if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
+		export CROSS_COMPILE=x86_64-linux-
+	elif [ "${arch}" = "ARMv7" ]; then
+		export CROSS_COMPILE=arm-linux-gnueabi-
+	elif [ "${arch}" = "AArch64" ]; then
+		export CROSS_COMPILE=aarch64-linux-gnu-
+	fi
+
+	for config in "${board_dir}/config"/*; do
+		if [ ! -f "${config}" ]; then
+			printf "%s: Target %s has no configs to build for. Skipping build.\n" \
+				"build/payload/u-boot" "${board}"
+			RET=1
+			continue
+		fi
+
+		config_name="${config#$board_dir/config/}"
+		if [ "$config_name" = "default" ]; then
+			dest_dir="payload/u-boot/${board}"
+		else
+			dest_dir="payload/u-boot/${board}/${config_name}"
+		fi
+		mkdir -p "${dest_dir}"
+
+		printf "%s: Building for target %s (config %s).\n" \
+			"build/payload/u-boot" "${board}" "${config_name}"
+
+		make -C "${ubdir}" distclean
+
+		cp "${config}" "${ubdir}/.config"
+		make -C "${ubdir}" olddefconfig
+		make -C "${ubdir}" -j"$(nproc)" all
+
+		for f in "${ubdir}"/u-boot{,.bin,.dtb,.img,.itb,.elf}; do
+			if [ -f "$f" ]; then
+				mv "$f" "${dest_dir}/"
+			fi
+		done
+
+		make -C "${ubdir}" distclean
+
+		printf "%s: Built for target %s (config %s).\n" \
+			"build/payload/u-boot" "${board}" "${config_name}"
+	done
+done
+
+printf "Done! U-Boot files are in payload/u-boot/\n\n"
+exit $RET
+
+# ------------------- DONE ----------------------
-- 
cgit v1.2.1


From 9bfbdb598df0ce46d0f124b5739861fa50a81eed Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Fri, 26 Aug 2022 13:55:18 +0300
Subject: scripts: Add helpers to modify and update U-Boot configs

These are almost verbatim copies of coreboot versions, but using
'u-boot' instead of 'coreboot' and 'ub*' instead of 'cb*'.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/modify/u-boot/configs | 83 +++++++++++++++++++++++++++++++++
 resources/scripts/update/u-boot/configs | 83 +++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100755 resources/scripts/modify/u-boot/configs
 create mode 100755 resources/scripts/update/u-boot/configs

(limited to 'resources/scripts')

diff --git a/resources/scripts/modify/u-boot/configs b/resources/scripts/modify/u-boot/configs
new file mode 100755
index 00000000..0ae749bb
--- /dev/null
+++ b/resources/scripts/modify/u-boot/configs
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+#
+#  helper script: modify U-Boot configs (run make menuconfig)
+#
+#	Copyright (C) 2021 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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/>.
+#
+
+# This script assumes that the working directory is the root
+# of git or release archive
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+printf "Modifying U-Boot configs\n"
+
+# Build ROM images for supported boards
+modifyconf() {
+	board="$1"
+	if [ -f "resources/u-boot/${board}/board.cfg" ]; then
+        ubtree="undefined"
+        source "resources/u-boot/${board}/board.cfg"
+        if [ "${ubtree}" = "undefined" ]; then
+            return 0
+        fi
+        if [ ! -d "u-boot/${ubtree}" ]; then
+            ./download u-boot ${ubtree}
+        fi
+        for ubcfg in resources/u-boot/${board}/config/*; do
+            if [ ! -f ${ubcfg} ]; then
+                continue
+            fi
+            (
+                cd u-boot/${ubtree}/
+                rm -f .config*
+                make distclean
+            )
+            mv $ubcfg u-boot/${ubtree}/.config
+            (
+                cd u-boot/${ubtree}/
+                make menuconfig
+            )
+            mv u-boot/${ubtree}/.config $ubcfg
+            rm -f u-boot/${ubtree}/.config*
+            (
+                cd u-boot/${ubtree}/
+                make distclean
+            )
+        done
+    else
+        printf "\nmodify/config/u-boot: no board.cfg for: %s\n" "${board}"
+    fi
+}
+
+if [ $# -gt 0 ]; then
+	for board in "${@}"; do
+	    modifyconf "${board}"
+	done
+else
+	for board in resources/u-boot/*; do
+        if [ ! -d "${board}" ]; then
+            continue
+        fi
+	    modifyconf "${board##*/}"
+	done
+fi
+
+printf "\n\n"
+
diff --git a/resources/scripts/update/u-boot/configs b/resources/scripts/update/u-boot/configs
new file mode 100755
index 00000000..462dc4e1
--- /dev/null
+++ b/resources/scripts/update/u-boot/configs
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+#
+#  helper script: update U-Boot configs (run make oldconfig)
+#
+#	Copyright (C) 2021 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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/>.
+#
+
+# This script assumes that the working directory is the root
+# of git or release archive
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+printf "Updating U-Boot configs\n"
+
+# Build ROM images for supported boards
+updateconf() {
+	board="$1"
+	if [ -f "resources/u-boot/${board}/board.cfg" ]; then
+        ubtree="undefined"
+        source "resources/u-boot/${board}/board.cfg"
+        if [ "${ubtree}" = "undefined" ]; then
+            return 0
+        fi
+        if [ ! -d "u-boot/${ubtree}" ]; then
+            ./download u-boot ${ubtree}
+        fi
+        for ubcfg in resources/u-boot/${board}/config/*; do
+            if [ ! -f ${ubcfg} ]; then
+                continue
+            fi
+            (
+                cd u-boot/${ubtree}/
+                rm -f .config*
+                make distclean
+            )
+            mv $ubcfg u-boot/${ubtree}/.config
+            (
+                cd u-boot/${ubtree}/
+                make oldconfig
+            )
+            mv u-boot/${ubtree}/.config $ubcfg
+            rm -f u-boot/${ubtree}/.config*
+            (
+                cd u-boot/${ubtree}/
+                make distclean
+            )
+        done
+    else
+        printf "\nupdate/config/u-boot: no board.cfg for: %s\n" "${board}"
+    fi
+}
+
+if [ $# -gt 0 ]; then
+	for board in "${@}"; do
+	    updateconf "${board}"
+	done
+else
+	for board in resources/u-boot/*; do
+        if [ ! -d "${board}" ]; then
+            continue
+        fi
+	    updateconf "${board##*/}"
+	done
+fi
+
+printf "\n\n"
+
-- 
cgit v1.2.1


From 769f18f2f601dbf666d0f52f67f79b82e582909a Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Fri, 26 Aug 2022 15:06:45 +0300
Subject: build/roms: Fix building for ARMv7 and AArch64 boards

The code that compiles coreboot crossgcc changes the working directory
to the coreboot directory, and the following code cannot find the lbmk
scripts that it needs to run. Compile ARMv7 and AArch64 cross compilers
in a subshell like in the x86 case so the rest of the script can work.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/boot/roms_helper | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index a6b64316..28053367 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -4,6 +4,7 @@
 #
 #	Copyright (C) 2020,2021 Leah Rowe <info@minifree.org>
 #	Copyright (C) 2021 Vitali64 <vitali64pmemail@protonmail.com>
+#	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.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
@@ -150,13 +151,17 @@ if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
 		)
 	fi
 elif [ "${arch}" = "ARMv7" ]; then
-	cat version > "${cbdir}/.coreboot-version"
-	cd "${cbdir}"
-	make crossgcc-arm CPUS=$(nproc) # This is for armv7, doesn't apply to aarch64
+	(
+		cat version > "${cbdir}/.coreboot-version"
+		cd "${cbdir}"
+		make crossgcc-arm CPUS=$(nproc) # This is for armv7, doesn't apply to aarch64
+	)
 elif [ "${arch}" = "AArch64" ]; then
-	cat version > "${cbdir}/.coreboot-version"
-	cd "${cbdir}"
-	make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
+	(
+		cat version > "${cbdir}/.coreboot-version"
+		cd "${cbdir}"
+		make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
+	)
 fi
 
 if [ ! -f "${cbfstool}" ]; then
-- 
cgit v1.2.1


From a69855f7e448b2f3f8947982ddd793d64914a011 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Fri, 26 Aug 2022 16:16:56 +0300
Subject: build/roms: Build 32-bit crossgcc for AArch64 as well

The 32-bit ARM cross compiler toolchain is used to build parts of
arm-trusted-firmware needed by AArch64 boards, compile the toolchain for
those boards as well.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/boot/roms_helper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 28053367..8b9ca358 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -160,7 +160,7 @@ elif [ "${arch}" = "AArch64" ]; then
 	(
 		cat version > "${cbdir}/.coreboot-version"
 		cd "${cbdir}"
-		make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
+		make crossgcc-arm crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
 	)
 fi
 
-- 
cgit v1.2.1


From 61ede99832424718200bddd2826eae4bda2c3c7a Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Fri, 26 Aug 2022 17:14:57 +0300
Subject: build/roms: Support using U-Boot as a coreboot payload

This enables embedding U-Boot into the coreboot roms as the payload. For
now, the ELF file generated by enabling CONFIG_REMAKE_ELF is used, which
includes the U-Boot binary and the board-specific device-tree file. It
might be better to use the FIT payload support for U-Boot, but that was
reportedly broken and is not tested yet.

Coreboot boards can specify payload_uboot="y" in their board.cfg to
enable building a rom with U-Boot as the payload, which is built from
the U-Boot board with the same name. Boards can further specify a
uboot_config option, to choose which board-specific config file U-Boot
should be built with.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/boot/roms_helper | 62 +++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 8b9ca358..deb40d57 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -64,6 +64,8 @@ payload_seabios="n"
 payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu
 seabios_opromloadonly="0"
 payload_memtest="n"
+payload_uboot="n"
+uboot_config="undefined"
 # Override the above defaults using board.cfg
 source "resources/coreboot/${board}/board.cfg"
 
@@ -110,7 +112,7 @@ fi
 # NOTE: reverse logic must not be applied. If SeaBIOS-with-GRUB works, that doesn't
 # necessarily mean GRUB-with-SeaBIOS will work nicely. for example, the board might
 # only have an add-on GPU available, where it's recommended to boot SeaBIOS first
-if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ]; then
+if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] && [ "${payload_uboot}" != "y" ]; then
 	while true; do
 		for configfile in "resources/coreboot/${board}/config/"*; do
 			if [ -f "${configfile}" ]; then
@@ -122,6 +124,16 @@ if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ]; then
 	done
 fi
 
+if [ "${payload_uboot}" != "n" ] && \
+		[ "${payload_uboot}" != "y" ]; then
+	payload_uboot="n"
+fi
+
+if [ "${payload_uboot}" = "y" ] && \
+		[ "${uboot_config}" = "undefined" ]; then
+	uboot_config="default"
+fi
+
 if [ "${payload_memtest}" = "y" ]; then
 	if [ ! -f "memtest86plus/memtest" ]; then
 		./build module memtest86plus
@@ -216,6 +228,21 @@ if [ "${payload_grub}" = "y" ] || [ "${payload_seabios_withgrub}" = "y" ]; then
 	done
 fi
 
+if [ "${payload_uboot}" = "y" ]; then
+	if [ "${uboot_config}" = "default" ] && \
+		[ -f "payload/u-boot/${board}/u-boot.elf" ]; then
+			ubootelf="payload/u-boot/${board}/u-boot.elf"
+	else
+		ubootelf="payload/u-boot/${board}/${uboot_config}/u-boot.elf"
+	fi
+
+	if [ ! -f "${ubootelf}" ]; then
+		printf "Required U-Boot payloads not yet built. Building now:\n"
+		rm -Rf "payload/u-boot/${board}" # just in case
+		./build payload u-boot "${board}"
+	fi
+fi
+
 # it is assumed that no other work will be done on the ROM
 # after calling this function. therefore this function is "final"
 moverom() {
@@ -325,6 +352,28 @@ make_seabios_rom() {
 	printf "%s\n" "${tmprom}"
 }
 
+# make a rom in /tmp/ and then print the path of that ROM
+make_uboot_payload_rom() {
+	target_cbrom="${1}" # rom to insert u-boot in. this rom won't be touched
+		# a tmpfile will be made instead
+	target_uboot_cbfs_path="${2}" # e.g. fallback/payload
+	target_uboot_config="${3}"
+	cbfstool_path="${4}"
+
+	if [ "${target_uboot_config}" = "default" ]; then
+		target_ubootelf="payload/u-boot/${board}/u-boot.elf"
+	else
+		target_ubootelf="payload/u-boot/${board}/${target_uboot_config}/u-boot.elf"
+	fi
+
+	tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
+
+	cp "${target_cbrom}" "${tmprom}"
+	"${cbfstool}" "${tmprom}" add-payload -f "${target_ubootelf}" -n ${target_uboot_cbfs_path} -c lzma
+
+	printf "%s\n" "${tmprom}"
+}
+
 # make a rom in /tmp/ and then print the path of that ROM
 make_grubrom_from_keymap() {
 	target_keymap="${1}"
@@ -455,6 +504,17 @@ mkRoms() {
 	if [ "${payload_grub}" = "y" ]; then
 		mkRomsWithGrub "${corebootrom}" "${initmode}" "${displaymode}" "grub"
 	fi
+
+	if [ "${payload_uboot}" = "y" ]; then
+		tmpubootrom="$(make_uboot_payload_rom "${corebootrom}" "fallback/payload" "${uboot_config}" "${cbfstool}")"
+		if [ "${initmode}" = "normal" ]; then
+			newrompath="${romdir}/uboot_payload_${board}_${initmode}.rom"
+		else
+			newrompath="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom"
+		fi
+		moverom "${tmpubootrom}" "${newrompath}" "${romtype}"
+		rm -f "${tmpubootrom}"
+	fi
 }
 
 initmode="libgfxinit"
-- 
cgit v1.2.1


From 6d6bd5eee0cdb626fb5e054db08c8e6136cfe579 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Sat, 27 Aug 2022 21:25:43 +0300
Subject: build/roms: Rebuild cbutils module before starting coreboot build

In recent coreboot versions, running distclean started to erase the
cbfstool binary we built earlier in the util/cbfstool dir via the
cbutils build script call. The coreboot build puts it in a different
directory, and the roms build script can't find it when trying to add
payloads to the roms. This doesn't make the script fail (because set -e
is stupid like that), and the build appears to succeed if you don't look
close enough to see the "cbfsutil not found" error.

Build the coreboot utils we want at the places we want them after
calling distclean, so that we can actually use cbfsutil and avoid
silently-broken roms with newer coreboot versions.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 resources/scripts/build/boot/roms_helper | 1 +
 1 file changed, 1 insertion(+)

(limited to 'resources/scripts')

diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index deb40d57..951e19ba 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -307,6 +307,7 @@ mkCoreboot() {
 		make distclean		
 	)
 	cp "${cbcfgpath}" "${cbdir}"/.config
+	./build module cbutils ${cbdir#coreboot/}
 	(
 		cd "${cbdir}"
 		make -j$(nproc)
-- 
cgit v1.2.1