From a994794efb75be62aa3200c6fee909aef18b7c76 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 10 Dec 2017 11:27:54 +0100 Subject: [PATCH] Rename the boot skeleton file to avoid confusing with the kernel bootblock. --- Kernel/platform-nc200/Makefile | 23 ++++++++++--------- .../{bootblock.s => floppyskeleton.s} | 0 2 files changed, 12 insertions(+), 11 deletions(-) rename Kernel/platform-nc200/{bootblock.s => floppyskeleton.s} (100%) diff --git a/Kernel/platform-nc200/Makefile b/Kernel/platform-nc200/Makefile index f0b91c45..9995b2d2 100644 --- a/Kernel/platform-nc200/Makefile +++ b/Kernel/platform-nc200/Makefile @@ -1,18 +1,19 @@ -bootfloppy.img: bootblock.img autoprg.bin +bootfloppy.img: floppyskeleton.img autoprg.bin ../fuzix.bin rm -f bootfloppy.img - cp bootblock.img bootfloppy.img + cp floppyskeleton.img bootfloppy.img truncate bootfloppy.img --size 7680 mcopy -i bootfloppy.img autoprg.bin ::auto.prg - #mcopy -i bootfloppy.img kernel1 ::load4000.80 - #mcopy -i bootfloppy.img kernel2 ::load4000.81 - #echo -n | mcopy -i bootfloppy.img - ::call4000.80 + dd if=../fuzix.bin bs=16k skip=0 count=1 | mcopy -i bootfloppy.img - ::load4000.80 + dd if=../fuzix.bin bs=16k skip=1 count=1 | mcopy -i bootfloppy.img - ::load4000.81 + dd if=../fuzix.bin bs=16k skip=2 count=1 | mcopy -i bootfloppy.img - ::load4000.82 + echo -n | mcopy -i bootfloppy.img - ::call4000.80 -bootblock.img: bootblock.s - sdasz80 -fflopzws bootblock.rel bootblock.s - sdldz80 -nwmx -i bootblock.ihx bootblock.rel +floppyskeleton.img: floppyskeleton.s + sdasz80 -fflopzws floppyskeleton.rel floppyskeleton.s + sdldz80 -nwmx -i floppyskeleton.ihx floppyskeleton.rel srec_cat -disable-sequence-warning \ - bootblock.ihx -intel \ - -output bootblock.img -binary + floppyskeleton.ihx -intel \ + -output floppyskeleton.img -binary autoprg.bin: autoprg.s sdasz80 -fflopzws autoprg.rel autoprg.s @@ -22,4 +23,4 @@ autoprg.bin: autoprg.s -output autoprg.bin -binary clean: - rm -f bootblock.img autoprg.bin bootfloppy.img + rm -f floppyskeleton.img autoprg.bin bootfloppy.img diff --git a/Kernel/platform-nc200/bootblock.s b/Kernel/platform-nc200/floppyskeleton.s similarity index 100% rename from Kernel/platform-nc200/bootblock.s rename to Kernel/platform-nc200/floppyskeleton.s -- 2.34.1