Inverse two arguments of cbfs-files-y and adapts its users (one of which already...

This is in reponse to feedback that the original setup was too complicated.

New cbfs-files-y behaviour:
cbfs-files-y contains the names of files as they appear in CBFS. The
arguments describe the on-filesystem name, the type and (optionally) the
position. Example:

cbfs-files-y += foo
foo-file := bar
foo-type := splashscreen
foo-position := 0xffff8000

This configures a CBFS file called "foo" that is marked "splashscreen",
located at 0xffff8000 in flash and contains the data of the file "bar"
in the filesystem (either in the current directory, ie. where the
corresponding Makefile.inc resides, or if that doesn't exist, relative
to the toplevel directory).

Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6319 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index 5876cdc616134b750bbf625bd797f14a948b589e..f5aa73080088b3581de4622a4ce332bb1f732753 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,10 +208,10 @@ includemakefiles= \
                        $$(subst $(top)/,, \
                        $$(abspath $$(addprefix $(dir $(1)),$$($(type)-y)))))) \
        $(foreach file,$(cbfs-files-y), \
-               $(if $(wildcard $(dir $(1))$(file)), \
-                       $(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$(file))), \
-                       $(eval tmp-cbfs-file:= $(file))) \
-               $(eval cbfs-files += $(tmp-cbfs-file)|$$($(file)-name)|$$($(file)-type)|$$($(file)-position)) \
+               $(if $(wildcard $(dir $(1))$$($(file)-file)), \
+                       $(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$$($(file)-file))), \
+                       $(eval tmp-cbfs-file:= $$($(file)-file))) \
+               $(eval cbfs-files += $(tmp-cbfs-file)|$(file)|$$($(file)-type)|$$($(file)-position)) \
                $(eval $(file)-name:=) \
                $(eval $(file)-type:=) \
                $(eval $(file)-position:=)) \

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index c9a62c926ea67e6197d1bd346ab73263aa2a4966..04e613f4aff248f29a90e91bc6a9f1cde01aac2b 100644 (file)
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -27,9 +27,9 @@ subdirs-y += smp
 
 OPTION_TABLE_H:=
 ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
-cbfs-files-y += $(obj)/cmos_layout.bin
-$(obj)/cmos_layout.bin-name = cmos_layout.bin
-$(obj)/cmos_layout.bin-type = 0x01aa
+cbfs-files-y += cmos_layout.bin
+cmos_layout.bin-file = $(obj)/cmos_layout.bin
+cmos_layout.bin-type = 0x01aa
 
 OPTION_TABLE_H:=$(obj)/option_table.h
 endif

diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc
index 659d2e225a8b21ce647bb294d5f495b75523d2df..b82ea413362523df4fea8628e915dac09780a9a9 100644 (file)
--- a/src/pc80/Makefile.inc
+++ b/src/pc80/Makefile.inc
@@ -10,7 +10,7 @@ subdirs-y += vga
 $(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H)
 $(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H)
 
-cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += $(CONFIG_CMOS_DEFAULT_FILE)
-$(CONFIG_CMOS_DEFAULT_FILE)-name := cmos.default
-$(CONFIG_CMOS_DEFAULT_FILE)-type := 0xaa
+cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
+cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE)
+cmos.default-type = 0xaa
 

diff --git a/src/southbridge/intel/sch/Makefile.inc b/src/southbridge/intel/sch/Makefile.inc
index 05f45ebe34bb0d9f28a7132cc33921a5f92bcc12..5d829dd31f773bb4f2aba7bc5aff3e749cc612b4 100644 (file)
--- a/src/southbridge/intel/sch/Makefile.inc
+++ b/src/southbridge/intel/sch/Makefile.inc
@@ -37,6 +37,6 @@ romstage-$(CONFIG_USBDEBUG) += usb_debug.c
 
 # We don't ship that, but booting without it is bound to fail
 cbfs-files-$(CONFIG_HAVE_CMC) += cmc.bin
-cmc.bin-name := $(CONFIG_CMC_FILE)
+cmc.bin-file := $(CONFIG_CMC_FILE)
 cmc.bin-type := 0xaa
 cmc.bin-position := 0xfffd0000