path: root/Makefile
diff options
authorPatrick Georgi <patrick.georgi@secunet.com>2011-01-30 16:31:15 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2011-01-30 16:31:15 +0000
commit5c0bca2ffd7e59462a1b553d130d4077824a4cdb (patch)
tree0fb20ae61112e035f8c71d0553d65de479106e1b /Makefile
parentaaafec31842d287527477337c179ec1dd7cca7d8 (diff)
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
Diffstat (limited to 'Makefile')
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5876cdc61..f5aa73080 100644
--- 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:=)) \