timer works in bochs and on physical machine. need global definition for bochs...
[akaros.git] / kern / Makefrag
index d811522..a34a580 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Makefile fragment for JOS kernel.
+# Makefile fragment for ROS kernel.
 # This is NOT a complete makefile;
 # you must run GNU make in the top-level directory
 # where the GNUmakefile is located.
@@ -30,6 +30,9 @@ KERN_SRCFILES :=      kern/entry.S \
                        kern/syscall.c \
                        kern/kdebug.c \
                        kern/apic.c \
+                       kern/testing.c \
+                       kern/atomic.c \
+                       kern/smp.c \
                        lib/printfmt.c \
                        lib/readline.c \
                        lib/string.c
@@ -86,12 +89,20 @@ $(OBJDIR)/kern/bochs.img: $(OBJDIR)/kern/kernel $(OBJDIR)/boot/boot
        $(V)dd if=$(OBJDIR)/boot/boot of=$(OBJDIR)/kern/bochs.img~ conv=notrunc 2>/dev/null
        $(V)dd if=$(OBJDIR)/kern/kernel of=$(OBJDIR)/kern/bochs.img~ seek=1 conv=notrunc 2>/dev/null
        $(V)mv $(OBJDIR)/kern/bochs.img~ $(OBJDIR)/kern/bochs.img
-# brho uses these
-#      $(V)cp $(OBJDIR)/kern/kernel mnt/hdd/texas
-#      $(V)sync
 
 all: $(OBJDIR)/kern/bochs.img
 
+kvm: $(OBJDIR)/kern/kernel
+       $(V)echo "+ (KVM) Copying to mnt/hdd"
+       $(V)cp $(OBJDIR)/kern/kernel mnt/hdd/texas
+       $(V)sync
+
+usb: $(OBJDIR)/kern/kernel
+       $(V)echo "+ (USB) Copying to /dev/sdb4"
+       $(V)cp $(OBJDIR)/kern/kernel /media/disk/texas
+       $(V)sync
+       $(V)umount /media/disk
+
 grub: $(OBJDIR)/jos-grub
 
 $(OBJDIR)/jos-grub: $(OBJDIR)/kern/kernel