diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-28 20:40:58 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-28 20:40:58 -0500 |
| commit | 0264bd2989c282c8ffaa13e1c491aa529789565e (patch) | |
| tree | 9715d26555dbd00d3834a69af9fe8eb5b381ea55 | |
| parent | 8d268655f465a19136cba290527b98e43e196769 (diff) | |
build flashrom by default, fix flashrom
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | modules.mk | 4 | ||||
| -rw-r--r-- | source-locations.sh | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -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 @@ -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)_*/' \ |