Patchwork remove pre-cbfs build system, pt. 1

login
register
about
Submitter Patrick Georgi
Date 2009-10-04 11:12:58
Message ID <1254654778.4077.13.camel@tetris>
Download mbox | patch
Permalink /patch/328/
State Accepted
Commit r4717
Headers show

Comments

Patrick Georgi - 2009-10-04 11:12:58
Hi,

attached patch removes a bit of pre-cbfs build system infrastructure.
Payloads are compressed by cbfstool itself, no need for external tools.


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Peter Stuge - 2009-10-04 12:21:10
Patrick Georgi wrote:
> attached patch removes a bit of pre-cbfs build system infrastructure.
> Payloads are compressed by cbfstool itself, no need for external tools.
> 
> 
> Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>

Acked-by: Peter Stuge <peter@stuge.se>

Patch

Index: src/arch/i386/Config.lb
===================================================================
--- src/arch/i386/Config.lb	(Revision 4716)
+++ src/arch/i386/Config.lb	(Arbeitskopie)
@@ -41,36 +41,6 @@ 
 	action	"$(HOSTCC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG -DBITSIZE=32 -DENDIAN=0 $< -o $@"
 end
 
-makerule payload
-	depends "$(PAYLOAD)"
-	action  "cp $< $@"
-end
-
-makerule payload.nrv2b
-	depends "$(PAYLOAD) nrv2b"
-	action  "./nrv2b e $(PAYLOAD) $@"
-end
-
-# unlike nrv2b, lzma is a huge build mess. If they want lzma, they have to have built it
-makerule payload.lzma
-	depends "$(PAYLOAD) "
-	action  "lzma -zc $(PAYLOAD) > $@ || 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 coreboot will change
-# what a mess. -- RGM
-# catch the case where there is no compression
-makedefine PAYLOAD-1:=payload
-
-# catch the case where there is precompression. Yes, this bites. 
-if CONFIG_PRECOMPRESSED_PAYLOAD 
-	makedefine PAYLOAD-1:=payload
-end
-
 if CONFIG_USE_FAILOVER_IMAGE
 	makedefine COREBOOT_APC:=
 	makedefine COREBOOT_RAM_ROM:=
@@ -81,9 +51,8 @@ 
 	end
 else
 	makerule coreboot.rom 
-		depends	"coreboot.strip buildrom $(PAYLOAD-1)"
-		action "touch cbfs-support; ./buildrom $< $@ /dev/null $(CONFIG_ROM_IMAGE_SIZE) $(CONFIG_ROM_SECTION_SIZE)"
-		action "if [ $(CONFIG_COMPRESSED_PAYLOAD_LZMA) -eq 1 ]; then echo l > cbfs-support; fi"
+		depends	"coreboot.strip buildrom"
+		action "./buildrom $< $@ /dev/null $(CONFIG_ROM_IMAGE_SIZE) $(CONFIG_ROM_SECTION_SIZE)"
 	end
 end