[coreboot] New patch to review for coreboot: 6555dcc Add preprocessing capabilities to the cbfs-files mechanism

Patrick Georgi (patrick@georgi-clan.de) gerrit at coreboot.org
Tue Apr 3 15:59:27 CEST 2012


Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/847

-gerrit

commit 6555dcc1828a30615b98652cccd80f707550a7fe
Author: Patrick Georgi <Patrick.Georgi at secunet.com>
Date:   Fri Mar 9 12:30:07 2012 +0100

    Add preprocessing capabilities to the cbfs-files mechanism
    
    It's now possible to generate files that are about to be added to
    CBFS by specifying "sourcefile:method" as real file name.
    
    This makes the build system use the cbfs-files-preprocessor-$(method)
    function to create a file from sourcefile. That generated file is
    then added to CBFS.
    
    The first method to be defined is "nvramtool". It expects a plain text
    specification of the CMOS configuration and emits the binary format
    suitable for cmos.default.
    
    Change-Id: I33a142718fc7238eaf5317b0ed62b4726d9b48f2
    Signed-off-by: Patrick Georgi <Patrick.Georgi at secunet.com>
---
 Makefile.inc |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 470077e..81d40df 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -79,12 +79,26 @@ $(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))
+
+#######################################################################
 # Add handler for arbitrary files in CBFS
 $(call add-special-class,cbfs-files)
 cbfs-files-handler= \
+		$(eval tmp-cbfs-method:=$(word 2, $(subst :, ,$($(2)-file)))) \
+		$(eval $(2)-file:=$(word 1, $(subst :, ,$($(2)-file)))) \
 		$(if $(wildcard $(1)$($(2)-file)), \
 			$(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \
 			$(eval tmp-cbfs-file:= $($(2)-file))) \
+		$(if $(tmp-cbfs-method), \
+			$(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \
+			$(eval tmp-cbfs-file:=$(shell mktemp $(obj)/mainboard/$(MAINBOARDDIR)/cbfs-file.XXXXXX).out) \
+			$(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \
 		$(eval cbfs-files += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-position)) \
 		$(eval $(2)-name:=) \
 		$(eval $(2)-type:=) \




More information about the coreboot mailing list