From ab7e3f0739d11c4294cf331a07328d6d5aeb5a68 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 15 Jun 2017 21:34:02 +0200 Subject: adapted kernel size to fit clang --- src/Makefile | 4 ++-- src/boot/stage2_real_functions.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 6689169..309db8f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,13 +15,13 @@ all: image.bin kernel.sym # + 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 5 sectors of stage 2, -# adapt NOF_LOAD_SECTORS to 42) +# adapt NOF_LOAD_SECTORS to 46) # 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 24064 image.tmp + truncate -s 26112 image.tmp cat image.tmp magic.bin > image.bin truncate -s 1474560 image.bin diff --git a/src/boot/stage2_real_functions.asm b/src/boot/stage2_real_functions.asm index 84713d5..8b4b5af 100644 --- a/src/boot/stage2_real_functions.asm +++ b/src/boot/stage2_real_functions.asm @@ -2,7 +2,7 @@ ; (note: the first sector gets loaded by the BIOS, the ; next 5 sectors are read by the simple stage 1 loader, ; so subtract 5 here!) -NOF_LOAD_SECTORS equ 42 +NOF_LOAD_SECTORS equ 46 ; data sections used for reading the kernel from disk SECTORS_PER_CYLINDER: -- cgit v1.2.3-54-g00ecf