From 63c9131eeb55e7db8a644bd3613bcdd15f83caf5 Mon Sep 17 00:00:00 2001 From: Marty Connor Date: Sun, 22 Jul 2007 20:41:53 -0400 Subject: [PATCH 1/4] Add NIC to targets that are always made. Even though it is only currently used for rom-o-matic.net code, it is good to make sure it gets built, and that the parsing code is working. --- src/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 1807465a..3ed947f3 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) From 767a3cef7732e0b89a8a98387bcbfb3ce033b679 Mon Sep 17 00:00:00 2001 From: Marty Connor Date: Sun, 22 Jul 2007 20:52:32 -0400 Subject: [PATCH 2/4] Changed #warning to FIXME for nvo hack warning. --- src/core/nvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/nvo.c b/src/core/nvo.c index 8c6c9c0f..d3cb77e7 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; /** From 4e177aee1797e14a71327e5f195e44f724281bc5 Mon Sep 17 00:00:00 2001 From: Marty Connor Date: Sun, 22 Jul 2007 20:56:26 -0400 Subject: [PATCH 3/4] Change #warning to FIXME for depca This ancient ISA driver should probably be removed. It is hard to get a card to test it with, and there are comments to the effect that it cannot work with relocation. I would be quite interested to get a bug report by someone who actually has this card. --- src/drivers/net/depca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c index c079c463..2e788267 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 */ From 02a7514128459aad4e13ab89cabf0a92502122ec Mon Sep 17 00:00:00 2001 From: Marty Connor Date: Sun, 22 Jul 2007 21:00:55 -0400 Subject: [PATCH 4/4] Change #warning to FIXME for ns8390.c This driver really needs to be rewritten. It tries to build both ISA and PCI images, and makes life diffifult for the build system and rom-o-matic.net. The warning was just a reminder that it needs to be cleaned up and re-factored to split the PCI and ISA drivers. --- src/drivers/net/ns8390.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c index 953a4e7d..19825974 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