diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-04 12:27:48 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-04 12:27:48 +0000 |
| commit | 0dd713330bb5fe6cca38b9165645535d5772192d (patch) | |
| tree | 3cd9b86b710d48d0a04b34fac9d81c7a1b195cc7 /src/arch/i386/Config.lb | |
| parent | 3c2d87495806b13ef7dc1bc29f0ea13cb2e1031b (diff) | |
| download | coreboot-0dd713330bb5fe6cca38b9165645535d5772192d.tar.xz | |
Remove 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>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4717 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/Config.lb')
| -rw-r--r-- | src/arch/i386/Config.lb | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb index e5e587c8f7..60b15906c3 100644 --- a/src/arch/i386/Config.lb +++ b/src/arch/i386/Config.lb @@ -41,36 +41,6 @@ makerule nrv2b 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 @@ if CONFIG_USE_FAILOVER_IMAGE 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 |