From 59dba6cfcdc6c154e4d46c14c42e7b6f0b84c7b5 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 16 Aug 2023 21:34:21 +0100
Subject: 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>
---
 resources/scripts/update/blobs/download |  8 ++++----
 resources/scripts/update/blobs/extract  | 10 +++++-----
 resources/scripts/update/blobs/inject   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'resources/scripts/update/blobs')

diff --git a/resources/scripts/update/blobs/download b/resources/scripts/update/blobs/download
index 04d5bd31..343e2a81 100755
--- a/resources/scripts/update/blobs/download
+++ b/resources/scripts/update/blobs/download
@@ -63,8 +63,8 @@ main()
 
 	if [ ! -d "${boarddir}" ]; then
 		fail "Target not defined"
-	elif [ ! -f "${boarddir}/board.cfg" ]; then
-		fail "Target missing board.cfg"
+	elif [ ! -f "${boarddir}/target.cfg" ]; then
+		fail "Target missing target.cfg"
 	fi
 	
 	detect_firmware || exit 0
@@ -78,7 +78,7 @@ detect_firmware()
 {
 	set -- "${boarddir}/config/"*
 	. ${1} 2>/dev/null
-	. "${boarddir}/board.cfg"
+	. "${boarddir}/target.cfg"
 
 	if [ "${CONFIG_HAVE_MRC}" = "y" ]; then
 		needs="${needs} MRC"
@@ -189,7 +189,7 @@ build_dependencies()
 	fi
 	if [ ! -d ${cbdir} ]; then
 		printf "downloading coreboot\n"
-		./download coreboot default \
+		./fetch_trees coreboot default \
 				|| fail "could not download coreboot"
 	fi
 	if [ ! -d bios_extract ]; then
diff --git a/resources/scripts/update/blobs/extract b/resources/scripts/update/blobs/extract
index b32ec0ea..63d09c02 100755
--- a/resources/scripts/update/blobs/extract
+++ b/resources/scripts/update/blobs/extract
@@ -49,8 +49,8 @@ check_board()
 		fail "file does not exist: ${vendor_rom}"
 	elif [ ! -d "${boarddir}" ]; then
 		fail "build/roms ${board}: target not defined"
-	elif [ ! -f "${boarddir}/board.cfg" ]; then
-		fail "build/roms ${board}: missing board.cfg"
+	elif [ ! -f "${boarddir}/target.cfg" ]; then
+		fail "build/roms ${board}: missing target.cfg"
 	fi
 }
 
@@ -66,11 +66,11 @@ build_dependencies()
 
 	if [ ! -d ${cbdir} ]; then
 		printf "downloading coreboot\n"
-		./download coreboot default \
+		./fetch_trees coreboot default \
 				|| fail "could not download coreboot"
 	else
 		printf "coreboot already downloaded. Skipping.\n"
-		printf "run ./download coreboot to manually overwrite\n"
+		printf "run ./fetch_trees coreboot to manually overwrite\n"
 	fi
 
 	if ! [ -f ${ifdtool} ]; then
@@ -86,7 +86,7 @@ extract_blobs()
 
 	set -- "${boarddir}/config/"*
 	. ${1} 2>/dev/null
-	. "${boarddir}/board.cfg"
+	. "${boarddir}/target.cfg"
 
 	if [ "$CONFIG_HAVE_MRC" = "y" ]; then
 		printf 'haswell board detected, downloading mrc\n'
diff --git a/resources/scripts/update/blobs/inject b/resources/scripts/update/blobs/inject
index 97cb35a6..46d83309 100755
--- a/resources/scripts/update/blobs/inject
+++ b/resources/scripts/update/blobs/inject
@@ -142,7 +142,7 @@ build_dependencies()
 {
 	if [ ! -d ${cbdir} ]; then
 		printf "downloading coreboot\n"
-		./download coreboot default
+		./fetch_trees coreboot default
 	fi
 
 	./build module cbutils default || fail "could not build cbutils"
@@ -200,7 +200,7 @@ patch_rom()
 
 	set -- "${boarddir}/config/"*
 	. ${1} 2>/dev/null
-	. "${boarddir}/board.cfg"
+	. "${boarddir}/target.cfg"
 
 	if [ "$CONFIG_HAVE_MRC" = "y" ]; then
 		inject_blob_intel_mrc "${rom}"
-- 
cgit v1.2.1