diff options
| author | Frans Kaashoek <[email protected]> | 2011-07-29 07:31:27 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-07-29 07:31:27 -0400 |
| commit | 9aa0337dc1452a911ac52698c833246a618fc9f3 (patch) | |
| tree | 28e25817d4f7c9f7f1e6988949012f46d6c28fb7 /Makefile | |
| parent | dccb915282854476ce47752df6631dcce3b8f661 (diff) | |
| download | xv6-labs-9aa0337dc1452a911ac52698c833246a618fc9f3.tar.gz xv6-labs-9aa0337dc1452a911ac52698c833246a618fc9f3.tar.bz2 xv6-labs-9aa0337dc1452a911ac52698c833246a618fc9f3.zip | |
Map kernel high
Very important to give qemu memory through PHYSTOP :(
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -109,7 +109,7 @@ initcode: initcode.S $(OBJDUMP) -S initcode.o > initcode.asm kernel: $(OBJS) multiboot.o data.o bootother initcode - $(LD) $(LDFLAGS) -Ttext 0x100000 -e main -o kernel multiboot.o data.o $(OBJS) -b binary initcode bootother + $(LD) $(LDFLAGS) -T kernel.ld -e multiboot_entry -o kernel multiboot.o data.o $(OBJS) -b binary initcode bootother $(OBJDUMP) -S kernel > kernel.asm $(OBJDUMP) -t kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym @@ -200,7 +200,7 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \ ifndef CPUS CPUS := 2 endif -QEMUOPTS = -hdb fs.img xv6.img -smp $(CPUS) +QEMUOPTS = -hdb fs.img xv6.img -smp $(CPUS) -m 512 qemu: fs.img xv6.img $(QEMU) -serial mon:stdio $(QEMUOPTS) |