4 files changed, 11 insertions, 8 deletions
diff --git a/resources/scripts/build/clean/cbutils b/resources/scripts/build/clean/cbutils
index 067c2cb2..bdacc45a 100755
--- a/resources/scripts/build/clean/cbutils
+++ b/resources/scripts/build/clean/cbutils
@@ -44,15 +44,15 @@ clean_cbutils()
 
 		# Clean coreboot, of course
 		make -C "${tree}/" distclean || \
-		    err "cannot distclean coreboot tree, ${tree}"
+		    err "clean_cbutils: ${tree}: cannot distclean"
 
 		# Clean its utilities as well
 		for util in cbfstool ifdtool nvramtool cbmem; do
 			make distclean -C "${tree}/util/${util}/" || \
-			    err "cannot clean util, ${util}, at ${tree}"
+			    err "clean_cbutils: ${cbtree} ${util}: can't clean"
 		done
 		make distclean -C "${tree}/payloads/libpayload/" || \
-		    err "cannot distclean libpayload, at ${tree}"
+		    err "clean_cbutils: ${tree}: can't distclean libpayload"
 	done
 }
 
diff --git a/resources/scripts/build/clean/crossgcc b/resources/scripts/build/clean/crossgcc
index 7b1765f8..c76d1849 100755
--- a/resources/scripts/build/clean/crossgcc
+++ b/resources/scripts/build/clean/crossgcc
@@ -37,7 +37,8 @@ clean_crossgcc()
 	for board in coreboot/*; do
 		[ -d "${board}" ] || continue
 		[ "${board##*/}" = "coreboot" ] && continue
-		make -C "${board}/" crossgcc-clean || err "make-clean"
+		make -C "${board}/" crossgcc-clean || \
+		    err "clean_crossgcc: ${board}: !make crossgcc-clean"
 	done
 }
 
diff --git a/resources/scripts/build/clean/seabios b/resources/scripts/build/clean/seabios
index c6759e83..0178a729 100755
--- a/resources/scripts/build/clean/seabios
+++ b/resources/scripts/build/clean/seabios
@@ -40,7 +40,8 @@ clean_seabios()
 	for x in seabios/*; do
 		[ ! -d "${x}" ] && continue
 		[ "${x}" = "seabios/seabios" ] && continue
-		make -C "${x}" distclean || err "cannot distclean tree, ${x}"
+		make -C "${x}" distclean || \
+		    err "clean_seabios: cannot distclean tree, ${x}"
 	done
 }
 
diff --git a/resources/scripts/build/clean/u-boot b/resources/scripts/build/clean/u-boot
index 7ba3a4a9..5deff216 100755
--- a/resources/scripts/build/clean/u-boot
+++ b/resources/scripts/build/clean/u-boot
@@ -39,11 +39,12 @@ clean_uboot()
 		fi
 
 		make -C "${board}/" distclean || \
-		    err "cannot distclean u-boot dir, ${board}"
+		    err "clean_uboot: cannot distclean ${board}"
 
-		[ ! -e "${board}/.git" ] || \
+		if [ -e "${board}/.git" ]; then
 			git -C "${board}" clean -fdx || \
-			    err "cannot clean u-boot git repo, ${board}"
+			    err "clean_uboot: ${board}: cannot clean git files"
+		fi
 	done
 }