Added ability to load an arbitrary binary from an ethernet server and launch it
[akaros.git] / kern / src / Makefrag
index 0e3338c..9453a3c 100644 (file)
@@ -35,28 +35,21 @@ KERN_SRCFILES := $(KERN_SRC_DIR)/entry.S \
                  $(KERN_SRC_DIR)/printfmt.c \
                  $(KERN_SRC_DIR)/readline.c \
                  $(KERN_SRC_DIR)/string.c \
-                 $(KERN_SRC_DIR)/timer.c
+                 $(KERN_SRC_DIR)/timer.c \
+                 $(KERN_SRC_DIR)/kmalloc.c \
+                 $(KERN_SRC_DIR)/rl8168.c
+
 # Only build files if they exist.
 KERN_SRCFILES := $(wildcard $(KERN_SRCFILES))
 
-KERN_APPFILES :=       $(USER_APPS_ROSLIB_DIR)/null \
-                    $(USER_APPS_ROSLIB_DIR)/hello 
-#                                      $(USER_APPS_ROSLIB_DIR)/hello \
-#                                      apps/hello \
-#                                      apps_newlib/null \
-#                              apps/hello \
-#                              apps/buggyhello \
-#                              apps/evilhello \
-#                              apps/testbss \
-#                              apps/divzero \
-#                              apps/breakpoint \
-#                              apps/softint \
-#                              apps/badsegment \
-#                              apps/faultread \
-#                              apps/faultreadkernel \
-#                              apps/faultwrite \
-#                              apps/faultwritekernel \
-#                              apps_newlib/null \
+KERN_APPFILES :=    $(USER_APPS_PARLIB_DIR)/matrix \
+                    $(USER_APPS_ROSLIB_DIR)/null \
+                    $(USER_APPS_ROSLIB_DIR)/hello \
+                    $(USER_APPS_PARLIB_DIR)/draw_nanwan_standalone \
+                    $(USER_APPS_ROSLIB_DIR)/measurements
+#                    $(USER_APPS_PARLIB_DIR)/draw_nanwan
+#                    $(USER_APPS_PARLIB_DIR)/open_read \
+#                    $(USER_APPS_PARLIB_DIR)/hello \
 
 KERN_LDFLAGS   := $(KERN_LDFLAGS) -L$(OBJDIR)/$(KERN_DIR) \
                   -T $(KERN_DIR)/kernel.ld
@@ -96,7 +89,7 @@ $(OBJDIR)/$(KERN_DIR)/kernel: $(KERN_LDDEPENDS)
 
 $(OBJDIR)/$(KERN_DIR)/bochs.img: $(OBJDIR)/$(KERN_DIR)/kernel $(OBJDIR)/$(KERN_DIR)/boot
        @echo + mk [KERN] $@
-       $(V)dd if=/dev/zero of=$(OBJDIR)/$(KERN_DIR)/bochs.img~ count=10000 2>/dev/null
+       $(V)dd if=/dev/zero of=$(OBJDIR)/$(KERN_DIR)/bochs.img~ count=10080 2>/dev/null
        $(V)dd if=$(OBJDIR)/$(KERN_DIR)/boot of=$(OBJDIR)/$(KERN_DIR)/bochs.img~ conv=notrunc 2>/dev/null
        $(V)dd if=$(OBJDIR)/$(KERN_DIR)/kernel of=$(OBJDIR)/$(KERN_DIR)/bochs.img~ seek=1 conv=notrunc 2>/dev/null
        $(V)mv $(OBJDIR)/kern/bochs.img~ $(OBJDIR)/kern/bochs.img