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

src/Makefile

@@ -14,6 +14,10 @@ NON_AUTO_MEDIA	:=
 MAKEDEPS	+= Config
 include Config
 
+# Location to place generated files
+#
+BIN		:= bin
+
 # If no architecture is specified in Config or on the command-line,
 # use that of the build machine.
 #
@@ -35,7 +39,7 @@ include arch/$(ARCH)/Config
 # If invoked with no build target, print out a helpfully suggestive
 # message.
 #
-noargs : blib
+noargs : blib $(BIN)/NIC
 	@echo '===================================================='
 	@echo
 	@echo ' *** WARNING: THE INSTRUCTIONS BELOW DO NOT FULLY WORK YET !!!  ***'
@@ -93,10 +97,6 @@ NRV2B		?= ./util/nrv2b
 ZBIN		?= ./util/zbin
 DOXYGEN		?= doxygen
 
-# Location to place generated files
-#
-BIN		?= bin
-
 # Common flags
 #
 CFLAGS		+= -I include -I arch/$(ARCH)/include -I . -DARCH=$(ARCH)

src/core/nvo.c

@@ -29,7 +29,7 @@
  *
  */
 
-#warning "Temporary hack"
+/* FIXME: "Temporary hack" */
 struct nvo_block *ugly_nvo_hack = NULL;
 
 /**

src/drivers/net/depca.c

@@ -1,4 +1,4 @@
-#warning "depca.c: FIXME: fix relocation"
+/* #warning "depca.c: FIXME: fix relocation" */
 
 #if 0
 /* Not fixed for relocation yet. Probably won't work relocated above 16MB */

src/drivers/net/ns8390.c

@@ -25,7 +25,8 @@ SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
 
 **************************************************************************/
 
-#warning "ns8390.c: FIXME: split ISA and PCI, clean up"
+/* #warning "ns8390.c: FIXME: split ISA and PCI, clean up" */
+
 #if 1