diff options
| author | Michael Brown | 2007-07-24 13:37:09 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-24 13:37:09 +0200 |
| commit | 90b5315db0071811a562d3e12df217d94f855485 (patch) | |
| tree | eadf68f508bf80f51fc7028988e256663409b82a | |
| parent | Minor debug improvement (diff) | |
| parent | Change #warning to FIXME for ns8390.c (diff) | |
| download | ipxe-90b5315db0071811a562d3e12df217d94f855485.tar.gz ipxe-90b5315db0071811a562d3e12df217d94f855485.tar.xz ipxe-90b5315db0071811a562d3e12df217d94f855485.zip | |
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
| -rw-r--r-- | src/Makefile | 10 | ||||
| -rw-r--r-- | src/core/nvo.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/depca.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/ns8390.c | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index 1807465a5..3ed947f3f 100644 --- a/src/Makefile +++ b/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) diff --git a/src/core/nvo.c b/src/core/nvo.c index 8c6c9c0f2..d3cb77e7c 100644 --- a/src/core/nvo.c +++ b/src/core/nvo.c @@ -29,7 +29,7 @@ * */ -#warning "Temporary hack" +/* FIXME: "Temporary hack" */ struct nvo_block *ugly_nvo_hack = NULL; /** diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c index c079c4634..2e788267d 100644 --- a/src/drivers/net/depca.c +++ b/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 */ diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c index 953a4e7d3..198259749 100644 --- a/src/drivers/net/ns8390.c +++ b/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 |