Separate payload compression from stage compression.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4659 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
d6ac964c89
commit
422d0cb712
5
Makefile
5
Makefile
|
@ -236,9 +236,10 @@ CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs
|
||||||
CFLAGS += -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow
|
CFLAGS += -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow
|
||||||
CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
|
CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
|
||||||
|
|
||||||
CBFS_COMPRESS_FLAG:=
|
|
||||||
ifeq ($(CONFIG_COMPRESSED_PAYLOAD_LZMA),y)
|
|
||||||
CBFS_COMPRESS_FLAG:=l
|
CBFS_COMPRESS_FLAG:=l
|
||||||
|
CBFS_PAYLOAD_COMPRESS_FLAG:=
|
||||||
|
ifeq ($(CONFIG_COMPRESSED_PAYLOAD_LZMA),y)
|
||||||
|
CBFS_PAYLOAD_COMPRESS_FLAG:=l
|
||||||
endif
|
endif
|
||||||
|
|
||||||
coreboot: prepare prepare2 $(obj)/coreboot.rom
|
coreboot: prepare prepare2 $(obj)/coreboot.rom
|
||||||
|
|
|
@ -25,7 +25,7 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
||||||
@printf " PAYLOAD none (as specified by user)\n"
|
@printf " PAYLOAD none (as specified by user)\n"
|
||||||
else
|
else
|
||||||
@printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
|
@printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
|
||||||
$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_COMPRESS_FLAG)
|
$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
|
||||||
ifeq ($(CONFIG_VGA_BIOS),y)
|
ifeq ($(CONFIG_VGA_BIOS),y)
|
||||||
@printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
|
@printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
|
||||||
$(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
|
$(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
|
||||||
|
|
Loading…
Reference in New Issue