SimpleOS

LXR

Navigation



Site hébergé par : enix

The LXR Cross Referencer for SOS

source navigation ]
diff markup ]
identifier search ]
general search ]
 
 
Article:1 ] [ 2 ] [ 3 ] [ 4 ] [ 5 ] [ 6 ] [ 6.5 ] [ 7 ] [ 7.5 ] [ 8 ] [ 9 ] [ 9.5 ]

Diff markup

Differences between /extra/Makefile (Article 4) and /extra/Makefile (Article 8)


001 OBJCOPY=objcopy                                   001 OBJCOPY=objcopy
                                                   >> 002 LIBGCC := $(shell $(CC) -print-libgcc-file-name) # To benefit from FP/64bits artihm.
                                                   >> 003 EXTRA := $(shell [ -f ../userland/userprogs.kimg ] && echo ../userland/userprogs.kimg)
002                                                   004 
003 all: sos_qemu.img                                 005 all: sos_qemu.img
004                                                   006 
005 -include ../.mkvars                               007 -include ../.mkvars
006                                                   008 
007 # The image is the simple concatenation of the    009 # The image is the simple concatenation of the boot sector and the kernel
008 # It may be use in bochs or on a real floppy,     010 # It may be use in bochs or on a real floppy, but NOT in qemu (see below)
009 sos_bsect.img: bsect.bin sos.bin                  011 sos_bsect.img: bsect.bin sos.bin
010         cat $^ > $@                               012         cat $^ > $@
011         @echo "You can use the $@ image i    013         @echo "You can use the $@ image in bochs or on a real floppy (NOT qemu)"
012                                                   014 
013 # For qemu, the trick is to tell it we have *m    015 # For qemu, the trick is to tell it we have *more* than 1440 sectors (720kB).
014 # Rtherwise the qemu disk geometry will be con    016 # Rtherwise the qemu disk geometry will be configured to be that of a 720kB
015 # floppy, while our boot sector assumes it to     017 # floppy, while our boot sector assumes it to be 1.44MB
016 sos_qemu.img: sos_bsect.img                       018 sos_qemu.img: sos_bsect.img
017         # Padding with 0s after the bsect/kern    019         # Padding with 0s after the bsect/kernel image
018         cat $< /dev/zero | dd of=$@ bs=1k coun    020         cat $< /dev/zero | dd of=$@ bs=1k count=1440
019         @echo "You can use the $@ image i    021         @echo "You can use the $@ image in qemu, bochs, or on a real floppy"
020                                                   022 
021 # we extract the boot sector from the main ELF    023 # we extract the boot sector from the main ELF binary
022 bsect.bin: sos_bsect.elf                          024 bsect.bin: sos_bsect.elf
023         $(OBJCOPY) -v -O binary -j .bootsect $    025         $(OBJCOPY) -v -O binary -j .bootsect $< $@
024                                                   026 
025 # we extract the kernel code from the main ELF    027 # we extract the kernel code from the main ELF binary
026 sos.bin: sos_bsect.elf                            028 sos.bin: sos_bsect.elf
027         $(OBJCOPY) -v -O binary -R .bootsect $    029         $(OBJCOPY) -v -O binary -R .bootsect $< $@
028                                                   030 
029 # The main ELF binary contains the boot sector    031 # The main ELF binary contains the boot sector and the kernel code
030 # linked together (hence we deal with a SINGLE    032 # linked together (hence we deal with a SINGLE image that we split
031 # above) because they share some symbol defini    033 # above) because they share some symbol definitions
032 sos_bsect.elf: bootsect.o compile_kernel          034 sos_bsect.elf: bootsect.o compile_kernel
033         $(LD) --warn-common -T ./sos_bsect.lds    035         $(LD) --warn-common -T ./sos_bsect.lds -o $@ \
034                 bootsect.o $(wildcard ../hwcor !! 036                 bootsect.o $(wildcard ../hwcore/*.o ../drivers/*.o ../sos/*.o)\
                                                   >> 037                 $(EXTRA) $(LIBGCC)
035                                                   038 
036 compile_kernel:                                   039 compile_kernel:
037         $(MAKE) -C ..                             040         $(MAKE) -C ..
038                                                   041 
039 clean:                                            042 clean:
040         $(RM) *.img *.elf *.bin *~ *.o *.out      043         $(RM) *.img *.elf *.bin *~ *.o *.out
                                                      

source navigation ] diff markup ] identifier search ] general search ]