build: re-factor the descriptor/gbe generating loop for GM45/ICH9M

1 files changed, 17 insertions, 12 deletions

diff --git a/build b/build
index 53e6935b..f7e61695 100755
--- a/build
+++ b/build
@@ -54,6 +54,7 @@ cd ../
 # Build ROM images for supported boards
 for board in $(ls resources/libreboot/config/)
 do
+	break
 	./buildrom-withgrub $board
 done
 
@@ -71,21 +72,25 @@ do
 	cd ../../
 done
 
-# Build the deblobbed descriptor+gbe images for X200.
+# Build the deblobbed descriptor+gbe regions for GM45/ICH9M targets.
 # Then put them in the ROM images.
-cd resources/utilities/ich9deblob/
-./ich9gen
-cd ../../../bin/x200_4mb/
-for rom in $(ls)
+cd bin/
+../resources/utilities/ich9deblob/ich9gen
+for board in "x200"
 do
-	dd if=../../resources/utilities/ich9deblob/ich9fdgbe_4m.bin of="$rom" bs=1 count=12k conv=notrunc
-done
-cd ../x200_8mb/
-for rom in $(ls)
-do
-	dd if=../../resources/utilities/ich9deblob/ich9fdgbe_8m.bin of="$rom" bs=1 count=12k conv=notrunc
+	for romsize in "4m" "8m"
+	do
+		cd "$board"_"$romsize"b/
+		for rom in $(ls)
+		do
+			dd if=../ich9fdgbe_"$romsize".bin of="$rom" bs=1 count=12k conv=notrunc
+		done
+		cd ../
+	done
 done
-cd ../../
+rm -f ich9fdgbe_4m.bin
+rm -f ich9fdgbe_8m.bin
+cd ../
 
 # The GRUB payloads are no longer needed
 rm -f coreboot/grub_vesafb.elf