Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 453 → Rev 454

/SPARTAN/trunk/Makefile
121,15 → 121,16
ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
.PHONY: all clean config depend
.PHONY: all clean config depend boot
 
all: kernel.bin
all: kernel.bin boot
 
-include Makefile.depend
 
clean:
find generic/src/ arch/$(ARCH)/src/ genarch/src/ -name '*.o' -exec rm \{\} \;
-rm -f kernel.bin kernel.map kernel.map.pre kernel.objdump src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch
-rm -f kernel.bin kernel.map kernel.map.pre kernel.objdump generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
$(MAKE) -C arch/$(ARCH)/boot clean
 
config:
ln -sfn ../../arch/$(ARCH)/include/ generic/include/arch
153,6 → 154,9
kernel.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
$(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
 
boot: kernel.bin
$(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`"
 
%.o: %.S
$(CC) $(ASFLAGS) $(CFLAGS) -c $< -o $@
 
/SPARTAN/trunk/arch/ia32/boot/Makefile
1,10 → 1,8
.PHONY: nothing build clean
.PHONY: build clean
 
nothing:
 
build: boot.bin
dd if=boot.bin of=../../../image.bin bs=512 conv=sync
-cat ../../../kernel.bin >>../../../image.bin
-cat ../../../kernel.bin >> ../../../image.bin
dd if=/dev/zero of=../../../image.bin bs=1 seek=1474559 count=1
 
boot.bin: boot.o
11,9 → 9,9
ld -T boot.ld -entry _start_0x7c00 --oformat binary boot.o -o $@
 
boot.o: boot.S
gcc -E -DKERNEL_SIZE=$(KERNEL_SIZE) boot.S >boot.s
gcc -E -DKERNEL_SIZE=$(KERNEL_SIZE) boot.S > boot.s
as boot.s -o $@
rm boot.s
 
clean:
-rm *.o *.bin
-rm -f boot.o boot.bin ../../../image.bin