summaryrefslogtreecommitdiffstats
path: root/resources/scripts/helpers/build
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-02-27 06:23:12 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-02-27 11:06:09 (EST)
commit756ee1f9eb4583b127b2233666643d16ad7fd8d2 (patch)
tree55c7e7d61b4efe1a73e27eea3acb7c9a8693a8dd /resources/scripts/helpers/build
parentfa2cf05665cac94ea797555e543c34222cb84dc6 (diff)
downloadlibreboot-756ee1f9eb4583b127b2233666643d16ad7fd8d2.zip
libreboot-756ee1f9eb4583b127b2233666643d16ad7fd8d2.tar.gz
libreboot-756ee1f9eb4583b127b2233666643d16ad7fd8d2.tar.bz2
use only 1 crossgcc revision in libreboot
Diffstat (limited to 'resources/scripts/helpers/build')
-rwxr-xr-xresources/scripts/helpers/build/clean/coreboot20
-rwxr-xr-xresources/scripts/helpers/build/module/coreboot36
2 files changed, 28 insertions, 28 deletions
diff --git a/resources/scripts/helpers/build/clean/coreboot b/resources/scripts/helpers/build/clean/coreboot
index 2f7701e..baaabbd 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 07659cd..d3e86cd 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
+)