From 0264bd2989c282c8ffaa13e1c491aa529789565e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 28 Dec 2014 20:40:58 -0500
Subject: build flashrom by default, fix flashrom

---
 Makefile            | 6 +++++-
 modules.mk          | 4 ++--
 source-locations.sh | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 38aa453..4b7e546 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@ roms = $(foreach board,$(boards),\
                            $(foreach romtype,$(romtypes),\
                                      $(board)_$(keymap)_$(romtype))))
 
-build: PHONY $(foreach rom,$(roms),bin/$(rom).rom bin/$(rom)_with_seabios.rom)
+build: PHONY \
+	$(foreach rom,$(roms),bin/$(rom).rom bin/$(rom)_with_seabios.rom) \
+	src/flashrom/flashrom_normal \
+	src/flashrom/flashrom_lenovobios_macronix \
+	src/flashrom/flashrom_lenovobios_sst \
 
 define _nl
 
diff --git a/modules.mk b/modules.mk
index acc045d..6dc2686 100644
--- a/modules.mk
+++ b/modules.mk
@@ -75,9 +75,9 @@ cleandeps-coreboot-custom:: PHONY
 	rm -f tmp/builddeps-coreboot-*.stamp
 
 tmp/builddeps-flashrom.stamp:: src/flashrom
-	$(MAKE) -C $< patchname=_normal PROGRAM=flashrom
+	$(MAKE) -C $< patchname=_normal
 	$(MAKE) -C $< patchname=_lenovobios_macronix
-	$(MAKE) -C $< patchname=_sst
+	$(MAKE) -C $< patchname=_lenovobios_sst
 	touch $@
 
 tmp/builddeps-grub.stamp:: src/grub
diff --git a/source-locations.sh b/source-locations.sh
index 472a7f3..e4bbb20 100644
--- a/source-locations.sh
+++ b/source-locations.sh
@@ -37,7 +37,7 @@ flashrom_mksource() {
 	cp "$resources"/flashrom/patch/flashchips_*.c .
 	sed -i \
 	    -e 's/^CFLAGS\s*?=.*/& -static/' \
-	    -e 's/^PROGRAM\s*=/PROGRAM = flashrom$(patchname)/' \
+	    -e 's/\$(PROGRAM)\$(EXEC_SUFFIX)/$(PROGRAM)$(patchname)$(EXEC_SUFFIX)/g' \
 	    -e 's/flashchips\.o/flashchips$(patchname).o/g' \
 	    -e 's/libflashrom\.a/libflashrom$(patchname).a/g' \
 	    -e 's/\(rm .*libflashrom\)\S*\.a/\1*.a $(PROGRAM)_*/' \
-- 
cgit v1.1-4-g5e80