summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-11-02 20:33:42 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-11-02 20:33:42 +0000
commit4da911ce1056fcdae5fab9627a8fec2581713a91 (patch)
tree60c28772b32c77f53702a65445c228e68090cfdf
parent8ccf68ba63bb82c099b549548b8f47d40a92acd3 (diff)
downloadnuttx-4da911ce1056fcdae5fab9627a8fec2581713a91.tar.gz
nuttx-4da911ce1056fcdae5fab9627a8fec2581713a91.tar.bz2
nuttx-4da911ce1056fcdae5fab9627a8fec2581713a91.zip
Missed in last commit
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@363 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/Makefile2
-rw-r--r--nuttx/drivers/net/dm90x0.c17
-rw-r--r--nuttx/netutils/Makefile2
3 files changed, 3 insertions, 18 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile
index 0f8704a80..0ddbc60e6 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -48,7 +48,7 @@ BOARD_DIR = configs/$(CONFIG_ARCH_BOARD)
# (except for parts of FSDIRS). We will exclude FSDIRS
# from the build if file descriptor support is disabled
-NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE)
+NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(BOARD_DIR)/src
FSDIRS = fs drivers
ifeq ($(CONFIG_NET),y)
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c
index ac7e2126d..5a8675bee 100644
--- a/nuttx/drivers/net/dm90x0.c
+++ b/nuttx/drivers/net/dm90x0.c
@@ -52,25 +52,10 @@
#define CONFIG_DEBUG_VERBOSE 1
/* Only one hardware interface supported */
+
#undef CONFIG_DM9X_NINTERFACES
#define CONFIG_DM9X_NINTERFACES 1
-#warning "The following belong in the config file"
-#define CONFIG_DM9X_STATS 1
-
-/* CS4 is used for DM9000A Ethernet. Interrupt is provided via GIO6
- * which must be configured to interrupt on the rising edge. Bus
- * width is 16-bits.
- */
-
-#define CONFIG_DM9X_BASE 0x60000300
-#define CONFIG_DM9X_IRQ 27
-#undef CONFIG_DM9X_BUSWIDTH8
-#define CONFIG_DM9X_BUSWIDTH16 1
-#undef CONFIG_DM9X_BUSWIDTH32
-#undef CONFIG_DM9X_CHECKSUM
-#undef CONFIG_DM9X_ETRANS
-
#include <time.h>
#include <string.h>
#include <debug.h>
diff --git a/nuttx/netutils/Makefile b/nuttx/netutils/Makefile
index a975296f9..6d8132f77 100644
--- a/nuttx/netutils/Makefile
+++ b/nuttx/netutils/Makefile
@@ -105,6 +105,6 @@ clean:
distclean: clean
@rm -f Make.dep .depend
@rm -f $(STRNG_CSRCS) $(STRNG_ASRCS)
- @rm -f rm .strings make.str netutil-strings.h makestrings$(EXEEXT)
+ @rm -f rm .strings Make.str netutil-strings.h makestrings$(EXEEXT)
-include Make.dep