From 53f486a3ea77d465de5e9387df69367e56a93ee0 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Thu, 14 Sep 2006 16:31:14 +0000 Subject: [PATCH] fix some really yuck stuff. now things might work. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2414 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/Config.lb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb index 1b0dbf7959..c13427042a 100644 --- a/src/arch/i386/Config.lb +++ b/src/arch/i386/Config.lb @@ -1,4 +1,5 @@ uses CONFIG_SMP +uses CONFIG_PRECOMPRESSED_ROM_STREAM uses CONFIG_USE_INIT init init/crt0.S.lb @@ -34,10 +35,24 @@ makerule payload.lzma action "lzma e $(PAYLOAD) $@" end + +# this one example shows the mess that has occurred. People are now mixing +# conditional if in the make style with if in the config language style. +# The -1 is linux standard. +# I don't much like it but it is the mode nowadays. So linuxbios will change +# what a mess. -- RGM +# catch the case where there is no compression makedefine PAYLOAD-1:=payload + +# match the case where a compression type is specified. makedefine PAYLOAD-$(CONFIG_COMPRESSED_ROM_STREAM_NRV2B):=payload.nrv2b makedefine PAYLOAD-$(CONFIG_COMPRESSED_ROM_STREAM_LZMA):=payload.lzma +# catch the case where there is precompression. Yes, this bites. +if CONFIG_PRECOMPRESSED_ROM_STREAM + makedefine PAYLOAD-1:=payload +end + makerule linuxbios.rom depends "linuxbios.strip buildrom $(PAYLOAD-1)" action "./buildrom $< $@ $(PAYLOAD-1) $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)"