projects
/
bootcensus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:jtsiomb/pcboot
[bootcensus]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9622719
..
2396eab
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,7
+10,7
@@
warn = -pedantic -Wall
#opt = -O2
dbg = -g
inc = -Isrc -Isrc/libc -Isrc/test
#opt = -O2
dbg = -g
inc = -Isrc -Isrc/libc -Isrc/test
-gccopt = -fno-pic -ffreestanding -nostdinc -fno-builtin
+gccopt = -fno-pic -ffreestanding -nostdinc -fno-builtin -ffast-math
CFLAGS = $(ccarch) -march=i386 $(warn) $(opt) $(dbg) $(gccopt) $(inc) $(def)
ASFLAGS = $(asarch) -march=i386 $(dbg) -nostdinc -fno-builtin $(inc)
CFLAGS = $(ccarch) -march=i386 $(warn) $(opt) $(dbg) $(gccopt) $(inc) $(def)
ASFLAGS = $(asarch) -march=i386 $(dbg) -nostdinc -fno-builtin $(inc)
@@
-28,16
+28,23
@@
floppy.img: boot.img
dd if=/dev/zero of=$@ bs=512 count=2880
dd if=$< of=$@ conv=notrunc
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) >$@
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)
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)
$(bin): $(elf)
- objcopy -O binary -R '.boot*' $< $@
+ objcopy -O binary -R '.boot*' -R .lowtext $< $@
$(elf): $(obj)
$(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
$(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 .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 $< $@
$(elf).sym: $(elf)
objcopy --only-keep-debug $< $@