From 4d9567a7561df6eeb0dd81f2faf522c8526163b0 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Sat, 14 Oct 2023 17:08:59 +0300
Subject: coreboot: gru: Use default coreboot tree

We don't really need a custom coreboot tree for Chromebooks. I had added
one, because at a cursory glance to the available config/coreboot/board
subdirectories I had the impression that I should. But upstreams have
one tree for every board and I think we should move towards that too.

Move the one important BL31 makefile patch into the default coreboot
patches, update the gru boards' configs by running savedefconfig in the
cros tree and then running olddefconfig in the default tree.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
 script/update/project/trees | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'script/update')

diff --git a/script/update/project/trees b/script/update/project/trees
index 9e6803cf..bb0899f0 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -196,9 +196,7 @@ check_cross_compiler()
 
 	cbdir="src/coreboot/${tree}"
 	[ "${project}" != "coreboot" ] && \
-		cbdir="src/coreboot/default" # not u-boot (e.g. linux)
-	[ "${project}" = "u-boot" ] && \
-		cbdir="src/coreboot/cros" # u-boot only used on coreboot/cros
+		cbdir="src/coreboot/default"
 
 	# only true if not building coreboot:
 	ctarget="${cbdir#src/coreboot/}"
-- 
cgit v1.2.1