3 files changed, 8 insertions, 12 deletions
diff --git a/resources/scripts/helpers/build/clean/crossgcc b/resources/scripts/helpers/build/clean/crossgcc
index e0a52924..e78e767a 100755
--- a/resources/scripts/helpers/build/clean/crossgcc
+++ b/resources/scripts/helpers/build/clean/crossgcc
@@ -24,5 +24,5 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-make -C "crossgcc/util/crossgcc/" distclean
+make -C "crossgcc/" crossgcc-clean
 
diff --git a/resources/scripts/helpers/build/module/crossgcc b/resources/scripts/helpers/build/module/crossgcc
index 28474ecd..801cd5e0 100755
--- a/resources/scripts/helpers/build/module/crossgcc
+++ b/resources/scripts/helpers/build/module/crossgcc
@@ -25,13 +25,13 @@
 set -u -e
 
 (
-cd "crossgcc/util/crossgcc/"
+cd "crossgcc/"
 if [ $# -lt 1 ]; then
-    make build-i386
-    make build-arm
+    make crossgcc-i386
+    make crossgcc-arm
 else
     for architecture in "${@}"; do
-        make build-${architecture}
+        make crossgcc-${architecture}
     done
 fi
 )
diff --git a/resources/scripts/helpers/download/crossgcc b/resources/scripts/helpers/download/crossgcc
index 853e3fdc..c53f6265 100755
--- a/resources/scripts/helpers/download/crossgcc
+++ b/resources/scripts/helpers/download/crossgcc
@@ -36,16 +36,12 @@ fi
 crossgccrevision="4351ace145c4069f9c93ca7541d6dfaf8300b53b"
 
 rm -Rf "crossgcc/"
-mkdir -p "crossgcc/"
 (
+    git clone https://review.coreboot.org/coreboot crossgcc || git clone https://github.com/coreboot/coreboot.git crossgcc
     cd "crossgcc/"
-    git clone https://review.coreboot.org/coreboot || git clone https://github.com/coreboot/coreboot.git
-    cd "coreboot/"
     git reset --hard ${crossgccrevision}
-    mkdir -p "../util/"
-    mv "util/crossgcc/" "../util/"
-    cd "../"
-    rm -Rf "coreboot/"
+    rm -Rf .git* */*/.git*
+    rm -Rf "3rdparty/"
 )
 
 printf "Deblobbing coreboot\n"