From 5cda460f19e91c3cbb664438c4a6d30f188cd69e Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 9 Aug 2007 20:17:35 -0700
Subject: [PATCH] Build the all-driver images by default, and print
 instructions for usage.

---
 src/Makefile              | 42 ++++++++++++++++-----------------------
 src/Makefile.housekeeping |  2 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d7b212cf..0f8ddca2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,36 +41,28 @@ include arch/$(ARCH)/Config
 # If invoked with no build target, print out a helpfully suggestive
 # message.
 #
-noargs : blib $(BIN)/NIC
-	@echo '===================================================='
+noargs : blib $(BIN)/NIC $(BIN)/gpxe.dsk $(BIN)/gpxe.iso $(BIN)/gpxe.usb
+	@echo '==========================================================='
 	@echo
-	@echo ' *** WARNING: THE INSTRUCTIONS BELOW DO NOT FULLY WORK YET !!!  ***'
-	@echo ' ***                    PLEASE STAY TUNED                       ***' 
+	@echo 'To create a bootable floppy, type'
+	@echo '    cat $(BIN)/gpxe.dsk > /dev/fd0'
+	@echo 'where /dev/fd0 is your floppy drive.  This will erase any'
+	@echo 'data already on the disk.'
 	@echo
-	@echo 'No target specified. To specify a target, do: '
+	@echo 'To create a bootable USB key, type'
+	@echo '    cat $(BIN)/gpxe.usb > /dev/sdX'
+	@echo 'where /dev/sdX is your USB key, and is *not* a real hard'
+	@echo 'disk on your system.  This will erase any data already on'
+	@echo 'the USB key.'
 	@echo
-	@echo '    make bin/<rom-name>.<output-format> '
+	@echo 'To create a bootable CD-ROM, burn the ISO image '
+	@echo '$(BIN)/gpxe.iso to a blank CD-ROM.'
 	@echo
-	@echo 'where <output-format> is one of {$(MEDIA) }'
+	@echo 'These images contain drivers for all supported cards.  You'
+	@echo 'can build more customised images, and ROM images, using'
+	@echo '    make bin/<rom-name>.<output-format>'
 	@echo
-	@echo 'or: '
-	@echo
-	@echo '    make all<output-format>s'
-	@echo
-	@echo 'to generate all possible images of format <output-format>'
-	@echo
-	@echo 'For example, '
-	@echo
-	@echo '    make allroms '
-	@echo
-	@echo 'will generate all possible .rom (rom burnable) images, and'
-	@echo
-	@echo '    make alldsks'
-	@echo
-	@echo 'will generate all possible .dsk (bootable floppy) images, or'
-	@echo
-	@echo '===================================================='
-	@exit 1
+	@echo '==========================================================='
 
 # Locations of utilities
 #
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 108cc3ab..1f054d53 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -180,7 +180,7 @@ CLEANUP		+= $(BIN)/NIC
 # TGT_ROM_NAME : the ROM name (e.g. "dfe538")
 # TGT_MEDIA    : the media type (e.g. "rom")
 #
-DRIVERS_etherboot = $(DRIVERS)
+DRIVERS_gpxe	= $(DRIVERS)
 CARD_DRIVER	= $(firstword $(DRIVER_$(1)) $(1))
 TGT_ELEMENTS	= $(subst --, ,$(firstword $(subst ., ,$(notdir $@))))
 TGT_PREFIX	= $(word 2,$(subst ., ,$(notdir $@)))