[coreboot-gerrit] Patch set updated for coreboot: 60b691d Simplify and repair the cmos.default handling.

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3223

-gerrit

commit 60b691d2e722ae4e55b87f81f721c719b498066a
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Thu May 9 22:19:17 2013 +0200

    Simplify and repair the cmos.default handling.
    
    Without that fix we have:
      make: *** No rule to make target `nvramtool', needed by `build/coreboot.pre1'.  Stop.
    
    This commit was tested on the Asus M4A785T-M with the following commit:
      Asus M4A785T-M: Add CMOS defaults.
    
    Change-Id: I548005a58f430ed7b6da5249a24bbdcae440a1e9
    Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
    Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
 Makefile.inc                  |  8 --------
 src/drivers/pc80/Makefile.inc | 10 ++++++++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index da350d1..71acc87 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -142,14 +142,6 @@ $(obj)/$(1).ramstage.o: src/$(1).asl $(obj)/config.h
 endef
 
 #######################################################################
-# Parse plaintext cmos defaults into binary format
-# arg1: source file
-# arg2: binary file name
-cbfs-files-processor-nvramtool= \
-	$(eval $(2): $(1) $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout | $(objutil)/nvramtool/nvramtool ; \
-		printf "    CREATE     $(2) (from $(1))\n"; $(objutil)/nvramtool/nvramtool -y $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout -D $(2).tmp -p $(1) && mv $(2).tmp $(2))
-
-#######################################################################
 # Link VSA binary to ELF-ish stage
 # arg1: source file
 # arg2: binary file name
diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index 23e986a..9c77a7a 100644
--- a/src/drivers/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
@@ -9,11 +9,17 @@ romstage-$(CONFIG_TPM) += tpm.c
 romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c
 subdirs-y += vga
 
-cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
-cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool
+ifeq ($(CONFIG_HAVE_CMOS_DEFAULT),y)
+cbfs-files-y += cmos.default
+cmos.default-file = $(obj)/cmos.default.bin
 cmos.default-type = 0xaa
+endif
 
 smm-y += mc146818rtc.c
 
 $(obj)/drivers/pc80/mc146818rtc.ramstage.o : $(obj)/build.h
 $(obj)/drivers/pc80/mc146818rtc.smm.o : $(obj)/build.h
+
+$(obj)/cmos.default.bin: $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout $(NVRAMTOOL)
+	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
+	$(NVRAMTOOL) -y $< -D $@.tmp -p $< && mv $@.tmp $@