[coreboot-gerrit] New patch to review for coreboot: abuild: change remove_board interface

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12275

-gerrit

commit 16ecdd443da16e759f0964b7c1ca8686a63072cf
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Fri Oct 30 23:25:23 2015 +0100

    abuild: change remove_board interface
    
    It's passed the mainboard's directory name (below $TARGET) directly
    in preparation of more rework in that area.
    
    Change-Id: I3a82b8673fdea07bc5c957f76f4685c34a805334
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 util/abuild/abuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 942698b..40d4b41 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -324,17 +324,16 @@ function remove_target
 		return 0
 	fi
 
-	VENDOR=$1
-	MAINBOARD=$2
+	local MAINBOARD=$1
 
 	# Save the generated coreboot.rom file of each board.
-	if [ -r "$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" ]; then
-		cp $TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom \
-		   ${VENDOR}_${MAINBOARD}_coreboot.rom
+	if [ -r "$TARGET/${MAINBOARD}/coreboot.rom" ]; then
+		cp $TARGET/${MAINBOARD}/coreboot.rom \
+		   ${MAINBOARD}_coreboot.rom
 	fi
 
-	printf "Removing build dir for board $VENDOR $MAINBOARD...\n"
-	rm -rf $TARGET/${VENDOR}_${MAINBOARD}
+	printf "Removing build dir for board $MAINBOARD...\n"
+	rm -rf $TARGET/${MAINBOARD}
 
 	return 0
 }
@@ -536,7 +535,7 @@ build_all_targets()
 	for VENDOR in $( vendors ); do
 		for MAINBOARD in $( mainboards $VENDOR ); do
 			build_target $VENDOR $MAINBOARD
-			remove_target $VENDOR $MAINBOARD
+			remove_target ${VENDOR}_${MAINBOARD}
 		done
 	done
 }
@@ -610,7 +609,7 @@ if [ "$target" != "" ]; then
 		failed=1
 	else
 		build_target $VENDOR $MAINBOARD
-		remove_target $VENDOR $MAINBOARD
+		remove_target ${VENDOR}_${MAINBOARD}
 		test "$mode" != "text" && \
 		test -f $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml && \
 		cat $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml >> $REAL_XMLFILE