From ceb0e427962d0656e672955585c04093b9efda90 Mon Sep 17 00:00:00 2001 From: rtm Date: Wed, 16 Aug 2006 01:56:00 +0000 Subject: proc[0] can sleep(), at least after it gets to main00() proc[0] calls iget(rootdev, 1) before forking init --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9a6b02d..a40289f 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3