Hi, we currently have special cases for VGABIOS, Intel MBI and splashscreens. Use cbfs-files-y instead, which provides a canonical way for adding raw files to CBFS.
Question is, if we should drop these Kconfig options entirely and let the user handle these entries in the board's Makefile.inc? Signed-off-by: Patrick Georgi <[email protected]>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index fc97580..40b13b9 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -43,15 +43,6 @@ endif ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) COREBOOT_ROM_DEPENDENCIES+=seabios endif -ifeq ($(CONFIG_VGA_BIOS),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_VGA_BIOS_FILE) -endif -ifeq ($(CONFIG_INTEL_MBI),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_MBI_FILE) -endif -ifeq ($(CONFIG_BOOTSPLASH),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_BOOTSPLASH_FILE) -endif ifeq ($(CONFIG_AP_CODE_IN_CAR),y) COREBOOT_ROM_DEPENDENCIES+=$(obj)/coreboot_ap endif @@ -95,18 +86,6 @@ ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) @printf " PAYLOAD SeaBIOS (internal, compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n" $(CBFSTOOL) [email protected] add-payload $(CONFIG_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif -ifeq ($(CONFIG_VGA_BIOS),y) - @printf " VGABIOS $(CONFIG_VGA_BIOS_FILE) $(CONFIG_VGA_BIOS_ID)\n" - $(CBFSTOOL) [email protected] add $(CONFIG_VGA_BIOS_FILE) "pci$(CONFIG_VGA_BIOS_ID).rom" optionrom -endif -ifeq ($(CONFIG_INTEL_MBI),y) - @printf " MBI $(CONFIG_MBI_FILE)\n" - $(CBFSTOOL) [email protected] add $(CONFIG_MBI_FILE) mbi.bin mbi -endif -ifeq ($(CONFIG_BOOTSPLASH),y) - @printf " BOOTSPLASH $(CONFIG_BOOTSPLASH_FILE)\n" - $(CBFSTOOL) [email protected] add $(CONFIG_BOOTSPLASH_FILE) bootsplash.jpg bootsplash -endif ifeq ($(CONFIG_GEODE_VSA_FILE),y) @printf " VSA $(CONFIG_VSA_FILENAME)\n" $(OBJCOPY) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(CONFIG_VSA_FILENAME) $(obj)/vsa.o @@ -117,6 +96,18 @@ endif @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ print +cbfs-files-$(CONFIG_VGA_BIOS) += pci$(call strip_quotes,$(CONFIG_VGA_BIOS_ID)).rom +pci$(CONFIG_VGA_BIOS_ID)-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE)) +pci$(CONFIG_VGA_BIOS_ID)-type := optionrom + +cbfs-files-$(CONFIG_INTEL_MBI) += mbi.bin +mbi.bin-file := $(call strip_quotes,$(CONFIG_MBI_FILE)) +mbi.bin-type := mbi + +cbfs-files-$(CONFIG_BOOTSPLASH) += bootsplash.jpg +bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) +bootsplash.jpg-type := bootsplash + ####################################################################### # i386 specific tools
signature.asc
Description: This is a digitally signed message part
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
