From c19916db0d89efe41b0ea3bcf8e62a1d578b21a6 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Wed, 6 Jun 2012 05:06:18 -0700 Subject: [PATCH 1/2] Update scc_bootinfo.asm when the initrd changed --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index b47cc898..f4f81939 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -35,7 +35,7 @@ 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 +scc_bootinfo.asm: bootinfo.sh initrd.img ./bootinfo.sh 0x01000000 initrd.img 1 533 0 > scc_bootinfo.asm scc_bootinfo.bin: scc_bootinfo.asm From 5a70cbbd750cfa7d95d9fbfe3f100f8a773288d5 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Wed, 6 Jun 2012 05:06:41 -0700 Subject: [PATCH 2/2] Make it easier to change the number of used cores This commit uses the CORENUM Makefile variable to generate scc_bootinfo.asm. This enables easier use of more than one core. --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index f4f81939..cfd2db1b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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 @@ -36,7 +37,7 @@ reset_vector.bin: reset_vector.o ld --oformat binary -Ttext 0 -melf_i386 -o $@ $< scc_bootinfo.asm: bootinfo.sh initrd.img - ./bootinfo.sh 0x01000000 initrd.img 1 533 0 > scc_bootinfo.asm + ./bootinfo.sh 0x01000000 initrd.img $(CORENUM) 533 `seq 0 $$(($(CORENUM) - 1))` > scc_bootinfo.asm scc_bootinfo.bin: scc_bootinfo.asm $(NASM) $(NASMFLAGS) -o $@ $<