diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-15 21:24:36 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-15 21:24:36 +0200 |
| commit | f8dd9dd71ab603af23e008f1147f652b429c9296 (patch) | |
| tree | 316bbf3585b9baeb55ca2b870e7be4724ce4936c /src/Makefile | |
| parent | 48f0fe5954a445ba890b6a3633bbbf46cddd07c9 (diff) | |
| download | abaos-f8dd9dd71ab603af23e008f1147f652b429c9296.tar.gz abaos-f8dd9dd71ab603af23e008f1147f652b429c9296.tar.bz2 | |
increased size of stage 2 bootloader by 1024 bytes
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index d32d3c1..6689169 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,12 +10,12 @@ MAGIC := $(shell printf '%x' `date +%s`) all: image.bin kernel.sym # truncate to correct number of sectors, we have -# 512 (boot, stage 1) + N * 512 (N currenty is 3, stage 2) = 3072 for boot.bin -# + M * 512 (M is currently 7) = 3144 for kernel.bin +# 512 (boot, stage 1) + N * 512 (N currenty is 5, stage 2) = 3072 for boot.bin +# + M * 512 (M is currently 39) = 19968 for kernel.bin # + 1 * 512 = 512 for magic.bin # (M + N + 1 is the number of sectors to be read in stage 2, as stage 1 -# loads only the first sector, and stage 1 loads 3 sectors of stage 2, -# adapt NOF_LOAD_SECTORS to 44) +# loads only the first sector, and stage 1 loads 5 sectors of stage 2, +# adapt NOF_LOAD_SECTORS to 42) # then we make sure the image has the size of a 1.44 MB floppy # (emulators like qemu do some guess work for CHS resolution based # on the size of the image) @@ -35,7 +35,7 @@ kernel.sym: kernel.elf $(OBJCOPY) --only-keep-debug kernel.elf kernel.sym kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o - $(LD) -o kernel.elf -N -n -Ttext 0x8400 --oformat elf32-i386 \ + $(LD) -o kernel.elf -N -n -Ttext 0x8800 --oformat elf32-i386 \ kernel/kernel.o kernel/kernel_asm.o \ kernel/console.o kernel/vgatext.o kernel/serial.o \ hardware/port.o hardware/port_asm.o \ |