use only 1 crossgcc revision in libreboot

2 files changed, 28 insertions, 28 deletions

diff --git a/resources/scripts/helpers/build/clean/coreboot b/resources/scripts/helpers/build/clean/coreboot
index 2f7701ec..baaabbd4 100755
--- a/resources/scripts/helpers/build/clean/coreboot
+++ b/resources/scripts/helpers/build/clean/coreboot
@@ -31,7 +31,8 @@ printf "Cleaning the previous build of coreboot and its utilities\n"
 # clean coreboot and crossgcc (source archives preserved)
 for payload in coreboot/*; do
 	for board in "${payload}/"*; do
-		# Clean coreboot, of course
+
+        # Clean coreboot, of course
 		make -C "${board}/" distclean
 
 		# Clean its utilities as well
@@ -40,16 +41,15 @@ for payload in coreboot/*; do
 		done
 		make -C "${board}/payloads/libpayload/" distclean
 
-		# Clean crossgcc
-		if [ "${payload##*/}" != "crossgcc" ]; then # is a symlink
-			# delete symlink to crossgcc
-			rm -f "${board}/util/crossgcc"
-		else # is the real crossgcc
-			# payload is crossgcc
-			# board is not a board, it's a coreboot revision
-			make -C "${board}/" crossgcc-clean
-		fi
+        rm -f "${board}/util/crossgcc"
 	done
 done
 
+# Also do the same for the crossgcc version of coreboot
+make -C "crossgcc/" crossgcc-clean
+for util in {cbfs,ifd,nvram}tool cbmem; do
+	make -C "crossgcc/util/${util}/" clean
+done
+make -C "crosgcc/" distclean
+
 printf "\n\n"
diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot
index 07659cdd..d3e86cd2 100755
--- a/resources/scripts/helpers/build/module/coreboot
+++ b/resources/scripts/helpers/build/module/coreboot
@@ -34,24 +34,24 @@ printf "Building the utilities in coreboot\n"
 for payload in coreboot/*; do
 	for board in "${payload}/"*; do
 
-		if [ "${payload##*/}" = "crossgcc" ]; then # build crossgcc
-
-			for architecture in i386 arm; do
-				make -j$(nproc) -BC "${board}/" crossgcc-${architecture}
-			done
-		else # build other utils
-			# cbfstool, cbmem, nvramtool
-			for util in {cbfs,nvram}tool cbmem; do
-				make -BC "${board}/util/${util}"
-			done
-			# create symlink to crossgcc
-			(
-			boardconfig_path="resources/libreboot/config/${payload##*/}/${board##*/}"
-			cbrevision="$(cat "${boardconfig_path}/cbrevision")"
-			cd "${board}/util/"
-			ln -s "../../../crossgcc/${cbrevision}/util/crossgcc/" crossgcc
-			)
-		fi
+	# cbfstool, cbmem, nvramtool
+	for util in {cbfs,nvram}tool cbmem; do
+		make -BC "${board}/util/${util}"
+	done
+	# create symlink to crossgcc
+	(
+	boardconfig_path="resources/libreboot/config/${payload##*/}/${board##*/}"
+	cbrevision="$(cat "${boardconfig_path}/cbrevision")"
+	cd "${board}/util/"
+	ln -s "../../../../crossgcc/util/crossgcc/" crossgcc
+	)
 
 	done
 done
+
+# Now build crossgcc
+(
+cd "crossgcc/"
+make crossgcc-i386
+make crossgcc-arm
+)