david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

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

This commit is contained in:
Michael Brown 2007-07-24 12:37:09 +01:00
parent 07e11f8af9 02a7514128
commit 90b5315db0
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

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

2
src/core/nvo.c
View File

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

2
src/drivers/net/depca.c
View File

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

3
src/drivers/net/ns8390.c
View File

@ -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 #if 1