- moved the int86 code out of the 2nd stage boot loader code, and into a

[bootcensus] / Makefile

diff --git a/Makefile b/Makefile
index 9622719..6887307 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,16 +28,23 @@ floppy.img: boot.img
        dd if=/dev/zero of=$@ bs=512 count=2880
        dd if=$< of=$@ conv=notrunc
 
+pcboot.iso: floppy.img
+       rm -rf cdrom
+       git archive --format=tar --prefix=cdrom/ HEAD | tar xf -
+       cp $< cdrom
+       mkisofs -o $@ -R -J -V pcboot -b $< cdrom
+
+
 boot.img: bootldr.bin $(bin)
        cat bootldr.bin $(bin) >$@
 
-# bootldr.bin will contain only .boot and .boot2
+# bootldr.bin will contain .boot, .boot2, .bootend, and .lowtext
 bootldr.bin: $(elf)
-       objcopy -O binary -j '.boot*' $< $@
+       objcopy -O binary -j '.boot*' -j .lowtext $< $@
 
-# the main binary will contain every section *except* .boot and .boot2
+# the main binary will contain every section *except* those
 $(bin): $(elf)
-       objcopy -O binary -R '.boot*' $< $@
+       objcopy -O binary -R '.boot*' -R .lowtext $< $@
 
 $(elf): $(obj)
        $(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
@@ -65,7 +72,7 @@ bootldr.disasm: $(elf)
        objdump -d $< -j .boot -j .boot2 -m i8086 >$@
 
 $(elf).disasm: $(elf)
-       objdump -d $< -j .startup -j .text -m i386 >$@
+       objdump -d $< -j .startup -j .text -j .lowtext -m i386 >$@
 
 $(elf).sym: $(elf)
        objcopy --only-keep-debug $< $@