diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-16 15:31:45 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-16 15:31:45 +0200 |
| commit | 8bf81b65af38daff5b298d53f4992b5bf9cb89d3 (patch) | |
| tree | f5f05ffd8b90fd870adacf5376d6c41a63d78637 /src/Makefile | |
| parent | 7d0b2bff84a50d304048f82086936fa8596a0e9f (diff) | |
| download | abaos-8bf81b65af38daff5b298d53f4992b5bf9cb89d3.tar.gz abaos-8bf81b65af38daff5b298d53f4992b5bf9cb89d3.tar.bz2 | |
added embedded VGA fonts, not so sure about the 8 heads for USB images
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 309db8f..68f3a0f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,18 +10,17 @@ 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 5, stage 2) = 3072 for boot.bin -# + M * 512 (M is currently 39) = 19968 for kernel.bin -# + 1 * 512 = 512 for magic.bin +# 512 (boot, stage 1) + N * 512 (N currenty is 5, stage 2) for boot.bin +# + M * 512 (M is currently 156) for kernel.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 5 sectors of stage 2, -# adapt NOF_LOAD_SECTORS to 46) +# adapt NOF_LOAD_SECTORS to 156) # 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) image.bin: boot.bin kernel.bin magic.bin cat boot.bin kernel.bin > image.tmp - truncate -s 26112 image.tmp + truncate -s 82432 image.tmp cat image.tmp magic.bin > image.bin truncate -s 1474560 image.bin @@ -34,7 +33,7 @@ kernel.bin: kernel.elf 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 +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 drivers/video/vga_font.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o $(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 \ @@ -43,7 +42,7 @@ kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext. hardware/pci.o \ drivers/driver.o \ drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o \ - drivers/video/vga.o \ + drivers/video/vga.o drivers/video/vga_font.o \ libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o magic.bin: boot/magic.asm |