GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Patrick Georgi 2011-01-30 16:31:15 +00:00 committed by Patrick Georgi
parent aaafec3184
commit 5c0bca2ffd
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -208,10 +208,10 @@ includemakefiles= \
$$(subst $(top)/,, \ $$(subst $(top)/,, \
$$(abspath $$(addprefix $(dir $(1)),$$($(type)-y)))))) \ $$(abspath $$(addprefix $(dir $(1)),$$($(type)-y)))))) \
$(foreach file,$(cbfs-files-y), \ $(foreach file,$(cbfs-files-y), \
$(if $(wildcard $(dir $(1))$(file)), \ $(if $(wildcard $(dir $(1))$$($(file)-file)), \
$(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$(file))), \ $(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$$($(file)-file))), \
$(eval tmp-cbfs-file:= $(file))) \ $(eval tmp-cbfs-file:= $$($(file)-file))) \
$(eval cbfs-files += $(tmp-cbfs-file)|$$($(file)-name)|$$($(file)-type)|$$($(file)-position)) \ $(eval cbfs-files += $(tmp-cbfs-file)|$(file)|$$($(file)-type)|$$($(file)-position)) \
$(eval $(file)-name:=) \ $(eval $(file)-name:=) \
$(eval $(file)-type:=) \ $(eval $(file)-type:=) \
$(eval $(file)-position:=)) \ $(eval $(file)-position:=)) \

6
src/arch/x86/Makefile.inc
View File

@ -27,9 +27,9 @@ subdirs-y += smp
OPTION_TABLE_H:= OPTION_TABLE_H:=
ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
cbfs-files-y += $(obj)/cmos_layout.bin cbfs-files-y += cmos_layout.bin
$(obj)/cmos_layout.bin-name = cmos_layout.bin cmos_layout.bin-file = $(obj)/cmos_layout.bin
$(obj)/cmos_layout.bin-type = 0x01aa cmos_layout.bin-type = 0x01aa
OPTION_TABLE_H:=$(obj)/option_table.h OPTION_TABLE_H:=$(obj)/option_table.h
endif endif

6
src/pc80/Makefile.inc
View File

@ -10,7 +10,7 @@ subdirs-y += vga
$(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H) $(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H)
$(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H) $(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H)
cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += $(CONFIG_CMOS_DEFAULT_FILE) cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
$(CONFIG_CMOS_DEFAULT_FILE)-name := cmos.default cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE)
$(CONFIG_CMOS_DEFAULT_FILE)-type := 0xaa cmos.default-type = 0xaa

2
src/southbridge/intel/sch/Makefile.inc
View File

@ -37,6 +37,6 @@ romstage-$(CONFIG_USBDEBUG) += usb_debug.c
# We don't ship that, but booting without it is bound to fail # We don't ship that, but booting without it is bound to fail
cbfs-files-$(CONFIG_HAVE_CMC) += cmc.bin 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-type := 0xaa
cmc.bin-position := 0xfffd0000 cmc.bin-position := 0xfffd0000