diff options
| author | rtm <rtm> | 2006-08-16 01:56:00 +0000 |
|---|---|---|
| committer | rtm <rtm> | 2006-08-16 01:56:00 +0000 |
| commit | ceb0e427962d0656e672955585c04093b9efda90 (patch) | |
| tree | 11e8f328e2da8263b91e99a6179e3283b3647681 /Makefile | |
| parent | 350e63f7a9b1be695c0cf69e380bd96733524f25 (diff) | |
| download | xv6-labs-ceb0e427962d0656e672955585c04093b9efda90.tar.gz xv6-labs-ceb0e427962d0656e672955585c04093b9efda90.tar.bz2 xv6-labs-ceb0e427962d0656e672955585c04093b9efda90.zip | |
proc[0] can sleep(), at least after it gets to main00()
proc[0] calls iget(rootdev, 1) before forking init
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -46,12 +46,12 @@ bootblock : bootasm.S bootmain.c $(OBJCOPY) -S -O binary bootblock.o bootblock ./sign.pl bootblock -kernel : $(OBJS) bootother.S userfs init +kernel : $(OBJS) bootother.S init $(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 main0 -o kernel $(OBJS) -b binary bootother userfs init + $(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary bootother init $(OBJDUMP) -S kernel > kernel.asm vectors.S : vectors.pl |