Author: myles Date: 2009-09-25 21:55:13 +0200 (Fri, 25 Sep 2009) New Revision: 276
Modified: buildrom-devel/Makefile buildrom-devel/packages/mkelfimage/mkelfimage.mk Log: Add $(HOSTTOOLS) to the payload and update mkelfimage.mk so that you can do: mkelfimage-clean make payload
and the correct thing happens. Trivial.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Myles Watson mylesgw@gmail.com
Modified: buildrom-devel/Makefile =================================================================== --- buildrom-devel/Makefile 2009-09-23 03:07:31 UTC (rev 275) +++ buildrom-devel/Makefile 2009-09-25 19:55:13 UTC (rev 276) @@ -106,7 +106,7 @@ # by coreboot, for v3 it is built by us, so we have ifdef magic here
ifeq ($(CONFIG_COREBOOT_V2),y) -rom: $(HOSTTOOLS-y) payload $(COREBOOT-y) +rom: payload $(COREBOOT-y) else
# If compressing the payload in v3, parse the elf and tell lar to compress it. @@ -115,7 +115,7 @@ LAR_PAYLOAD_FLAGS-y=-a -e LAR_PAYLOAD_FLAGS-$(CONFIG_USE_LZMA) += -C lzma
-rom: $(HOSTTOOLS-y) payload $(COREBOOT-y) +rom: payload $(COREBOOT-y) @ mkdir -p $(shell dirname $(TARGET_ROM_FILE)) @ cp $(CBV3_OUTPUT) $(TARGET_ROM_FILE) @ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(PAYLOAD_TARGET):normal/payload @@ -133,7 +133,7 @@ custom: custom-clean:
-payload: $(DEPENDS-y) $(PAYLOAD_TARGET) +payload: $(HOSTTOOLS-y) $(DEPENDS-y) $(PAYLOAD_TARGET)
extract: $(PKG_extract)
Modified: buildrom-devel/packages/mkelfimage/mkelfimage.mk =================================================================== --- buildrom-devel/packages/mkelfimage/mkelfimage.mk 2009-09-23 03:07:31 UTC (rev 275) +++ buildrom-devel/packages/mkelfimage/mkelfimage.mk 2009-09-25 19:55:13 UTC (rev 276) @@ -57,8 +57,9 @@
mkelfimage-clean: @ rm -f $(MKELFIMAGE_STAMP_DIR)/.configured + @ rm -f $(STAGING_DIR)/sbin/mkelfImage ifneq ($(wildcard $(MKELFIMAGE_SRC_DIR)/Makefile),) - $(MAKE) -C $(MKELFIMAGE_SRC_DIR) clean + @ $(MAKE) -C $(MKELFIMAGE_SRC_DIR) clean endif
mkelfimage-distclean:
-
svn＠coreboot.org