blob: b5c6f82e7f17fadba4cf3c269545a7977f31b6c3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff --git a/boot/Makefile b/boot/Makefile
index 0d883b0..2d52f3f 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -20,7 +20,7 @@ makemode := utility
SRCS = mach-crt0.c boot.c ux.c sigvec.S syscall.S \
boot_script.c userland-boot.c
-COMMON-OBJS = notifyServer.o ourdeviceServer.o \
+COMMON-OBJS = notifyServer.o deviceServer.o \
ioServer.o io_replyUser.o device_replyUser.o \
termServer.o bootstrapServer.o boot_script.o userland-boot.o
OBJS = boot.o $(COMMON-OBJS)
@@ -39,10 +39,6 @@ include ../Makeconf
all: boot # uxboot
-ourdevice.defs: device.defs
- $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[ ]*device_t/s/device_t/mach_port_send_t/' > $@
-
-
uxboot.o: boot.c
$(COMPILE.c) -DUX $< -o $@
diff --git a/boot/boot.c b/boot/boot.c
index 0dbe1c2..ed29014 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -42,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <version.h>
#include "notify_S.h"
-#include "ourdevice_S.h"
+#include "device_S.h"
#include "io_S.h"
#include "device_reply_U.h"
#include "io_reply_U.h"
|
