[commit] r6319 - in trunk: . src/arch/x86 src/pc80 src/southbridge/intel/sch

[repository service]

Author: oxygene
Date: Sun Jan 30 17:31:15 2011
New Revision: 6319
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6319

Log:
Inverse two arguments of cbfs-files-y and adapts its users (one of which already used the new order)

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 
Acked-by: Stefan Reinauer

Modified:
   trunk/Makefile
   trunk/src/arch/x86/Makefile.inc
   trunk/src/pc80/Makefile.inc
   trunk/src/southbridge/intel/sch/Makefile.inc

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jan 30 08:40:32 2011	(r6318)
+++ trunk/Makefile	Sun Jan 30 17:31:15 2011	(r6319)
@@ -208,10 +208,10 @@
    		$$(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:=)) \

Modified: trunk/src/arch/x86/Makefile.inc
==============================================================================
--- trunk/src/arch/x86/Makefile.inc	Sun Jan 30 08:40:32 2011	(r6318)
+++ trunk/src/arch/x86/Makefile.inc	Sun Jan 30 17:31:15 2011	(r6319)
@@ -27,9 +27,9 @@

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

Modified: trunk/src/pc80/Makefile.inc
==============================================================================
--- trunk/src/pc80/Makefile.inc	Sun Jan 30 08:40:32 2011	(r6318)
+++ trunk/src/pc80/Makefile.inc	Sun Jan 30 17:31:15 2011	(r6319)
@@ -10,7 +10,7 @@
 $(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

Modified: trunk/src/southbridge/intel/sch/Makefile.inc
==============================================================================
--- trunk/src/southbridge/intel/sch/Makefile.inc	Sun Jan 30 08:40:32 2011	(r6318)
+++ trunk/src/southbridge/intel/sch/Makefile.inc	Sun Jan 30 17:31:15 2011	(r6319)
@@ -37,6 +37,6 @@

# 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