aboutsummaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2006-09-14 16:31:14 +0000
committerRonald G. Minnich <rminnich@gmail.com>2006-09-14 16:31:14 +0000
commit53f486a3ea77d465de5e9387df69367e56a93ee0 (patch)
tree40df7b75cc64fa9ac72da05fdd9e02b703bb760d /src/arch
parentcba07dd682f0142474f0aa235e97b6fcbc34d760 (diff)
fix some really yuck stuff.
now things might work. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2414 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/Config.lb15
1 files changed, 15 insertions, 0 deletions
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)"