summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-11-05 22:08:47 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-11-05 22:11:46 (EST)
commit8241c45f0d6762729a9f02e41ca04784d210e259 (patch)
treefe7c6a63b59702c8ad2f67adc137e3e95b51f990
parent56878e05bf9e889f28c93f71934bdede2aecc4de (diff)
downloadlibreboot-8241c45f0d6762729a9f02e41ca04784d210e259.zip
libreboot-8241c45f0d6762729a9f02e41ca04784d210e259.tar.gz
libreboot-8241c45f0d6762729a9f02e41ca04784d210e259.tar.bz2
build/module/coreboot: also build crossgcc arm
-rw-r--r--docs/git/index.html12
-rw-r--r--docs/maintain/index.html13
-rwxr-xr-xresources/scripts/helpers/build/module/coreboot6
3 files changed, 7 insertions, 24 deletions
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