stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into x64_new

Browse source
This commit is contained in:
Stefan Lankes 2012-06-10 08:07:50 +02:00
commit be4cfaf413
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/Makefile
View file

@ -8,6 +8,7 @@ DEFINES=
NASM = nasm
NASMFLAGS = -fbin
EXECFILES = $(shell find ../newlib/examples -perm -u+r+x -type f)
CORENUM ?= 1
# other implicit rules
%.o : %.c
@ -35,8 +36,8 @@ scc_setup.bin: scc_setup.asm
reset_vector.bin: reset_vector.o
ld --oformat binary -Ttext 0 -melf_i386 -o $@ $<
scc_bootinfo.asm: bootinfo.sh
./bootinfo.sh 0x01000000 initrd.img 1 533 0 > scc_bootinfo.asm
scc_bootinfo.asm: bootinfo.sh initrd.img
./bootinfo.sh 0x01000000 initrd.img $(CORENUM) 533 `seq 0 $$(($(CORENUM) - 1))` > scc_bootinfo.asm
scc_bootinfo.bin: scc_bootinfo.asm
$(NASM) $(NASMFLAGS) -o $@ $<