From 8241c45f0d6762729a9f02e41ca04784d210e259 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Thu, 05 Nov 2015 22:08:47 -0500
Subject: build/module/coreboot: also build crossgcc arm

---
diff --git a/docs/git/index.html b/docs/git/index.html
index 69b41e3..87b656a 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -874,18 +874,6 @@
 			</p>
 
 			<p>
-				NOTE: crossgcc is included in <i>coreboot/util/crossgcc/tarballs/</i> in the release archives,
-				but the build system for libreboot does not automatically download/build it.
-				If you are using libreboot from the git repository, make sure to do the following:<br/>
-				$ <b>cd coreboot/</b><br/>
-				$ <b>make crossgcc-i386</b><br/>
-				$ <b>make crossgcc-arm</b><br/>
-				$ <b>cd ../</b><br/>
-				This will download coreboot's reference cross-compile toolchain,
-				which is highly recommended by the coreboot project.
-			</p>
-
-			<p>
 				After that, build the ROM images (for all boards):<br/>
 				$ <b>./build roms withgrub</b><br/>
 				Alternatively, you can build for a specific board or set of boards.
diff --git a/docs/maintain/index.html b/docs/maintain/index.html
index 3a0da0a..f71d67e 100644
--- a/docs/maintain/index.html
+++ b/docs/maintain/index.html
@@ -395,25 +395,18 @@
 			
 			<p>
 				Finally, re-build the parts from coreboot that are used
-				by the build system:<br/>
+				by the build system (also builds GCC):<br/>
 				$ <b>./build module coreboot</b>
 			</p>
-
-			<p>
-				You also need to build crossgcc:<br/>
-				$ <b>cd coreboot/</b><br/>
-				$ <b>make crossgcc-i386</b><br/>
-				$ <b>make crossgcc-arm</b><br/>
-				$ <b>cd ../</b>
-			</p>
 			
 			<p>
-				Instead of running the above command, you can save time
+				Before running the above command, you can save time
 				by copying out the crossgcc that you compiled before
 				(from coreboot/util/crossgcc/) and then putting it back.
 				After you've done that, run everything in
 				<i>resources/scripts/helpers/build/module/coreboot</i>
 				except for the part that builds GCC.
+				<b>Only do this if the version is correct.</b>
 			</p>
 			
 			<p>
diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot
index cfca253..b33f1e3 100755
--- a/resources/scripts/helpers/build/module/coreboot
+++ b/resources/scripts/helpers/build/module/coreboot
@@ -31,8 +31,10 @@ set -u -e
 printf "Building the utilities in coreboot\n"
 
 # crossgcc
-# coreboot is 32-bit, so only build for i386
-make -j$(nproc) -BC coreboot crossgcc-i386
+# coreboot on x86 is 32-bit, so only build for i386. Also build for ARM
+for architecture in i386 arm; do
+	make -j$(nproc) -BC coreboot crossgcc-${architecture}
+done
 
 # cbfstool, ifdtool, cbmem, nvramtool
 for util in {cbfs,ifd,nvram}tool cbmem; do
--
cgit v0.9.1