r165 - buildrom-devel

Author: jcrouse
Date: 2008-04-25 17:40:25 +0200 (Fri, 25 Apr 2008)
New Revision: 165

Modified:
   buildrom-devel/Makefile
Log:
buildrom:  payloads should be parsed as ELFs with compression or not

Signed-off-by: Jordan Crouse 
Acked-by: Myles Watson

Modified: buildrom-devel/Makefile
===================================================================
--- buildrom-devel/Makefile	2008-04-25 15:24:46 UTC (rev 164)
+++ buildrom-devel/Makefile	2008-04-25 15:40:25 UTC (rev 165)
@@ -71,12 +71,10 @@

# If compressing the payload in v3, parse the elf and tell lar to compress it.
 # Parsing the elf without compression bloats the ROM with bss zeroes.
-ifeq ($(CONFIG_USE_LZMA),y)
-LAR_PAYLOAD_FLAGS=-a -e -C lzma
-else
-LAR_PAYLOAD_FLAGS=-a
-endif
-	
+
+LAR_PAYLOAD_FLAGS-y=-a -e
+LAR_PAYLOAD_FLAGS-$(CONFIG_USE_LZMA) += -C lzma
+
 ifeq ($(or $(CONFIG_VSA_LEGACY), $(CONFIG_VSA_OPENVSA)),)
 else
 OPTIONROM_TARGETS+=geodevsa
@@ -84,15 +82,15 @@

rom: $(HOSTTOOLS-y) payload $(COREBOOT-y)
    @ cp $(CBV3_OUTPUT) $(TARGET_ROM_FILE)
-	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS) $(TARGET_ROM_FILE) $(CBV3_PAYLOAD_TARGET):normal/payload
+	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(CBV3_PAYLOAD_TARGET):normal/payload
 ifeq ($(CONFIG_VSA_LEGACY),y)
-	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS) $(TARGET_ROM_FILE) $(SOURCE_DIR)/amd_vsa_lx_1.01.bin:blob/vsa
+	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(SOURCE_DIR)/amd_vsa_lx_1.01.bin:blob/vsa
 endif
 ifeq ($(CONFIG_VSA_OPENVSA),y)
    @ echo "Adding OpenVSA: TODO FIXME - let's actually implement this?"
 endif
    @ for file in `ls $(ROM_DIR)`; do \
-		$(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS) $(TARGET_ROM_FILE) $(ROM_DIR)/$$file:$$file; \
+		$(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(ROM_DIR)/$$file:$$file; \
    done
    @ $(STAGING_DIR)/bin/lar -z $(TARGET_ROM_FILE)
 endif