diff options
| author | Frans Kaashoek <kaashoek@40.sub-75-213-160.myvzw.com> | 2011-08-11 12:25:10 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@40.sub-75-213-160.myvzw.com> | 2011-08-11 12:25:10 -0400 |
| commit | bd71a45046eb13797284216c43353b9b6c92f18c (patch) | |
| tree | d8dd23644bd69d3abd91daf688998b2a9b0df1d4 /Makefile | |
| parent | 673b739d314b77532f0c60d0eaed4b518b912694 (diff) | |
| download | xv6-labs-bd71a45046eb13797284216c43353b9b6c92f18c.tar.gz xv6-labs-bd71a45046eb13797284216c43353b9b6c92f18c.tar.bz2 xv6-labs-bd71a45046eb13797284216c43353b9b6c92f18c.zip | |
Make AP processors boot using bootpgdir
Remove device mapping from bootpgdir
Remove unnecessary vmenable
Set CPUS back to 2 in Makefile
Passes all usertests
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -98,10 +98,10 @@ bootblock: bootasm.S bootmain.c ./sign.pl bootblock bootother: bootother.S - $(CC) $(CFLAGS) -nostdinc -I. -c bootother.S - $(LD) $(LDFLAGS) -N -e start -Ttext 0x7000 -o bootother.out bootother.o - $(OBJCOPY) -S -O binary bootother.out bootother - $(OBJDUMP) -S bootother.o > bootother.asm + $(CC) $(CFLAGS) -fno-pic -nostdinc -I. -c bootother.S + $(LD) $(LDFLAGS) -N -e start -Ttext 0x7000 -o bootblockother.o bootother.o + $(OBJCOPY) -S -O binary -j .text bootblockother.o bootother + $(OBJDUMP) -S bootblockother.o > bootother.asm initcode: initcode.S $(CC) $(CFLAGS) -nostdinc -I. -c initcode.S @@ -199,7 +199,7 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \ then echo "-gdb tcp::$(GDBPORT)"; \ else echo "-s -p $(GDBPORT)"; fi) ifndef CPUS -CPUS := 1 +CPUS := 2 endif QEMUOPTS = -hdb fs.img xv6.img -smp $(CPUS) -m 512 |