diff options
| author | kaashoek <kaashoek> | 2006-06-22 01:28:57 +0000 |
|---|---|---|
| committer | kaashoek <kaashoek> | 2006-06-22 01:28:57 +0000 |
| commit | 21a88fd487177841c882d9017bd9f4476801c6f6 (patch) | |
| tree | bfa061e00662efde2186d6c0498fc78f889356ce /Makefile | |
| parent | 7baa34a421e4c970ee90c2537ceacd7230f2474e (diff) | |
| download | xv6-labs-21a88fd487177841c882d9017bd9f4476801c6f6.tar.gz xv6-labs-21a88fd487177841c882d9017bd9f4476801c6f6.tar.bz2 xv6-labs-21a88fd487177841c882d9017bd9f4476801c6f6.zip | |
checkpoint. booting second processor. stack is messed up, but thanks to cliff
and plan 9 code, at least boots and gets into C code.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,5 +1,5 @@ OBJS = main.o console.o string.o kalloc.o proc.o trapasm.o trap.o vectors.o \ - syscall.o ide.o picirq.o mp.o + syscall.o ide.o picirq.o mp.o spinlock.o CC = i386-jos-elf-gcc LD = i386-jos-elf-ld @@ -20,8 +20,12 @@ bootblock : bootasm.S bootmain.c $(OBJCOPY) -S -O binary bootblock.o bootblock ./sign.pl bootblock -kernel : $(OBJS) - $(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) +kernel : $(OBJS) bootother.S + $(CC) -nostdinc -I. -c bootother.S + $(LD) -N -e start -Ttext 0x7000 -o bootother.out bootother.o + $(OBJCOPY) -S -O binary bootother.out bootother + $(OBJDUMP) -S bootother.o > bootother.asm + $(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary bootother $(OBJDUMP) -S kernel > kernel.asm vectors.S : vectors.pl |