Implement a proper block layer with partition support.

[pintos-anon] / src / Makefile.build

diff --git a/src/Makefile.build b/src/Makefile.build
index b73320579ecc342f0b28b0f8bc78bb3ea513de3b..e997d2787543cb4860edff352660dea9ae350bcf 100644 (file)
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -2,17 +2,18 @@
 
 SRCDIR = ../..
 
-all: os.dsk
+all: kernel.bin loader.bin
 
 include ../../Make.config
 include ../Make.vars
 include ../../tests/Make.tests
 
 # Compiler and assembler options.
-os.dsk: CPPFLAGS += -I$(SRCDIR)/lib/kernel
+kernel.bin: CPPFLAGS += -I$(SRCDIR)/lib/kernel
 
 # Core kernel.
-threads_SRC  = threads/init.c          # Main program.
+threads_SRC  = threads/start.S         # Startup code.
+threads_SRC += threads/init.c          # Main program.
 threads_SRC += threads/thread.c                # Thread management core.
 threads_SRC += threads/switch.S                # Thread switch routine.
 threads_SRC += threads/interrupt.c     # Interrupt core.
@@ -20,7 +21,6 @@ threads_SRC += threads/intr-stubs.S   # Interrupt stubs.
 threads_SRC += threads/synch.c         # Synchronization.
 threads_SRC += threads/palloc.c                # Page allocator.
 threads_SRC += threads/malloc.c                # Subpage allocator.
-threads_SRC += threads/start.S         # Startup code.
 
 # Device driver code.
 devices_SRC  = devices/pit.c           # Programmable interrupt timer chip.
@@ -28,7 +28,9 @@ devices_SRC += devices/timer.c                # Periodic timer device.
 devices_SRC += devices/kbd.c           # Keyboard device.
 devices_SRC += devices/vga.c           # Video device.
 devices_SRC += devices/serial.c                # Serial port device.
-devices_SRC += devices/disk.c          # IDE disk device.
+devices_SRC += devices/block.c         # Block device abstraction layer.
+devices_SRC += devices/partition.c     # Partition block device.
+devices_SRC += devices/ide.c           # IDE disk block device.
 devices_SRC += devices/input.c         # Serial and keyboard input.
 devices_SRC += devices/intq.c          # Interrupt queue.
 devices_SRC += devices/rtc.c           # Real-time clock.
@@ -81,24 +83,23 @@ kernel.o: threads/kernel.lds.s $(OBJECTS)
        $(LD) -T $< -o $@ $(OBJECTS)
 
 kernel.bin: kernel.o
-       $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
-       dd if=$@.tmp of=$@ bs=4096 conv=sync
-       rm $@.tmp
+       $(OBJCOPY) -R .note -R .comment -S $< $@
 
-threads/loader.o: threads/loader.S kernel.bin
-       $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+threads/loader.o: threads/loader.S
+       $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
 
 loader.bin: threads/loader.o
-       $(LD) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
+       $(LD) -N -e 0 -Ttext 0x7c00 --oformat binary -o $@ $<
 
-os.dsk: loader.bin kernel.bin
+os.dsk: kernel.bin
        cat $^ > $@
 
 clean::
        rm -f $(OBJECTS) $(DEPENDS) 
        rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
+       rm -f kernel.bin.tmp
        rm -f kernel.o kernel.lds.s
-       rm -f kernel.bin loader.bin os.dsk
+       rm -f kernel.bin loader.bin
        rm -f bochsout.txt bochsrc.txt
        rm -f results grade