From: Michael Brown <mcb30@etherboot.org>
Date: Sun, 9 Sep 2007 12:31:38 +0000 (+0100)
Subject: Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
X-Git-Url: http://git.etherboot.org/people/xl0/gpxe.git/commitdiff_plain/98de16befd50b2922a8c26ba2a0f447a738adac2?hp=6f799db5bd64ad408d7903679ac4d40ef9f48958

Merge branch 'master' of rom.etherboot.org:/gpxe
---

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 53842294..6db4cea6 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -401,6 +401,15 @@ allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%
 $(BIN)/etherboot.% : $(BIN)/gpxe.%
 	ln -sf $(notdir $<) $@
 
+# Wrap up binary blobs
+#
+$(BIN)/%.o : payload/%.img
+	$(QM)echo "  [WRAP] $@"
+	$(Q)$(LD) -b binary -r -o $@ $< --undefined obj_payload \
+		--defsym obj_$*=0
+
+BOBJS += $(patsubst payload/%.img,$(BIN)/%.o,$(wildcard payload/*.img))
+
 # The compression utilities
 #
 $(NRV2B) : util/nrv2b.c $(MAKEDEPS)
diff --git a/src/payload/hello.img b/src/payload/hello.img
new file mode 100644
index 00000000..bc7774a7
--- /dev/null
+++ b/src/payload/hello.img
@@ -0,0 +1 @@
+hello world!
\ No newline at end of file