Browse Source

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

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
90b5315db0
4 changed files with 9 additions and 8 deletions
  1. 5
    5
      src/Makefile
  2. 1
    1
      src/core/nvo.c
  3. 1
    1
      src/drivers/net/depca.c
  4. 2
    1
      src/drivers/net/ns8390.c

+ 5
- 5
src/Makefile View File

14
 MAKEDEPS	+= Config
14
 MAKEDEPS	+= Config
15
 include Config
15
 include Config
16
 
16
 
17
+# Location to place generated files
18
+#
19
+BIN		:= bin
20
+
17
 # If no architecture is specified in Config or on the command-line,
21
 # If no architecture is specified in Config or on the command-line,
18
 # use that of the build machine.
22
 # use that of the build machine.
19
 #
23
 #
35
 # If invoked with no build target, print out a helpfully suggestive
39
 # If invoked with no build target, print out a helpfully suggestive
36
 # message.
40
 # message.
37
 #
41
 #
38
-noargs : blib
42
+noargs : blib $(BIN)/NIC
39
 	@echo '===================================================='
43
 	@echo '===================================================='
40
 	@echo
44
 	@echo
41
 	@echo ' *** WARNING: THE INSTRUCTIONS BELOW DO NOT FULLY WORK YET !!!  ***'
45
 	@echo ' *** WARNING: THE INSTRUCTIONS BELOW DO NOT FULLY WORK YET !!!  ***'
93
 ZBIN		?= ./util/zbin
97
 ZBIN		?= ./util/zbin
94
 DOXYGEN		?= doxygen
98
 DOXYGEN		?= doxygen
95
 
99
 
96
-# Location to place generated files
97
-#
98
-BIN		?= bin
99
-
100
 # Common flags
100
 # Common flags
101
 #
101
 #
102
 CFLAGS		+= -I include -I arch/$(ARCH)/include -I . -DARCH=$(ARCH)
102
 CFLAGS		+= -I include -I arch/$(ARCH)/include -I . -DARCH=$(ARCH)

+ 1
- 1
src/core/nvo.c View File

29
  *
29
  *
30
  */
30
  */
31
 
31
 
32
-#warning "Temporary hack"
32
+/* FIXME: "Temporary hack" */
33
 struct nvo_block *ugly_nvo_hack = NULL;
33
 struct nvo_block *ugly_nvo_hack = NULL;
34
 
34
 
35
 /**
35
 /**

+ 1
- 1
src/drivers/net/depca.c View File

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

+ 2
- 1
src/drivers/net/ns8390.c View File

25
 
25
 
26
 **************************************************************************/
26
 **************************************************************************/
27
 
27
 
28
-#warning "ns8390.c: FIXME: split ISA and PCI, clean up"
28
+/* #warning "ns8390.c: FIXME: split ISA and PCI, clean up" */
29
+
29
 #if 1
30
 #if 1
30
 
31
 
31
 
32
 

Loading…
Cancel
Save