diff options
| author | Patrick Georgi <patrick.georgi@secunet.com> | 2011-01-30 16:31:15 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2011-01-30 16:31:15 +0000 |
| commit | 5c0bca2ffd7e59462a1b553d130d4077824a4cdb (patch) | |
| tree | 0fb20ae61112e035f8c71d0553d65de479106e1b | |
| parent | aaafec31842d287527477337c179ec1dd7cca7d8 (diff) | |
| download | coreboot-staging-5c0bca2ffd7e59462a1b553d130d4077824a4cdb.zip coreboot-staging-5c0bca2ffd7e59462a1b553d130d4077824a4cdb.tar.gz | |
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 <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
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/pc80/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/southbridge/intel/sch/Makefile.inc | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -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 c9a62c9..04e613f 100644 --- 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 659d2e2..b82ea41 100644 --- 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 05f45eb..5d829dd 100644 --- 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 |
