move building to build/

2 files changed, 95 insertions, 66 deletions

diff --git a/Makefile b/Makefile
index 3463d25..e9d9852 100644
--- a/Makefile
+++ b/Makefile
@@ -1,75 +1,19 @@
-CFLAGS=-mcpu=cortex-a7 -ffreestanding -std=gnu11 -Wall -Wextra $(addprefix -I,$(subst :, ,$(VPATH)))
-ELFFLAGS=-nostdlib -lgcc
+# actual recipes for everything are in build/Makefile;
 
-ARM_OBJECTS=kernel.o paging.o demo_functionality.o PL0_test.o uart.o loader_stage1.o loader_stage2.o
+% :
+	echo generic
+	$(MAKE) -C build $@
 
-KERNEL_STAGE2_OBJECTS=setup.o interrupt_vector.o interrupts.o uart.o demo_functionality.o paging.o ramfs_embeddable.o ramfs.o strings.o io.o atags.o scheduler.o
+# below is just for shell auto-completion
 
-PL_0_TEST_OBJECTS=PL0_utils.o svc.o PL0_test.o strings.o io.o
+all :
 
-LOADER_STAGE2_OBJECTS=uart.o strings.o io.o loader_stage2.o
+qemu-elf :
 
-RAMFS_FILES=PL0_test.img
+qemu-bin :
 
-all : kernel.img
+qemu-loader :
 
-src= src:src/arm/common:src/arm/PL1/kernel:src/arm/PL1/PL1_common:src/arm/PL0:src/host:src/arm/PL1/loader:src/lib/rs232
-VPATH=$(src)
-
-%.o : %.c
-	arm-none-eabi-gcc $(CFLAGS) -c $^ -o $@
-
-%.img : %.elf
-	arm-none-eabi-objcopy $^ -O binary $@
-
-%.o: %.S
-	arm-none-eabi-as -mcpu=cortex-a7 $^ -o $@
-
-%_embeddable.o : %.img
-	arm-none-eabi-objcopy -I binary -O elf32-littlearm -B arm  $^ $@
-
-%.elf : %.ld
-	arm-none-eabi-gcc -T $< -o $@ $(ELFFLAGS) $(filter %.o,$^)
-
-PL0_test.elf : $(PL_0_TEST_OBJECTS)
-
-kernel.elf : kernel_stage1.o
-
-kernel_stage2.elf : $(KERNEL_STAGE2_OBJECTS)
-
-loader_stage2.elf : $(LOADER_STAGE2_OBJECTS)
-
-loader.elf : loader_stage1.o
-
-kernel_stage1.o : kernel_stage1.S kernel_stage2.img
-	arm-none-eabi-as -mcpu=cortex-a7 $< -o $@
-
-loader_stage1.o : loader_stage1.S  loader_stage2.img
-	arm-none-eabi-as -mcpu=cortex-a7 $< -o $@
-
-qemu-elf : kernel.elf
-	qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^
-
-qemu-bin : kernel.img
-	qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^
-
-qemu-loader : loader.img kernel.img pipe_image
-	./pipe_image --stdout | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $<
-
-run-on-rpi : kernel.img pipe_image
-	./pipe_image --stdout | sudo socat FILE:/dev/ttyUSB0,b115200,raw -
-	screen  /dev/ttyUSB0 115200,cs8,-parenb,-cstopb,-hupcl
-
-pipe_image : pipe_image.c rs232.c
-	gcc -Wall -std=gnu99 -Isrc/lib/rs232 -O3 $^ -o $@
-
-makefs : makefs.c
-	gcc -Wall -std=gnu99 -O3 $^ -o $@
-
-ramfs.img : makefs $(RAMFS_FILES)
-	./makefs $(RAMFS_FILES) > $@
+run-on-rpi :
 
 clean :
-	-rm -f *.img *.elf *.o pipe_image makefs
-
-.PHONY: all qemu-elf qemu-bin clean
diff --git a/build/Makefile b/build/Makefile
new file mode 100644
index 0000000..25f2da9
--- /dev/null
+++ b/build/Makefile
@@ -0,0 +1,85 @@
+CFLAGS=-mcpu=cortex-a7 -ffreestanding -std=gnu11 -Wall -Wextra $(addprefix -I, $(dirs))
+ELFFLAGS=-nostdlib -lgcc
+
+ARM_OBJECTS=kernel.o paging.o demo_functionality.o PL0_test.o uart.o loader_stage1.o loader_stage2.o
+
+KERNEL_STAGE2_OBJECTS=setup.o interrupt_vector.o interrupts.o uart.o demo_functionality.o paging.o ramfs_embeddable.o ramfs.o strings.o io.o atags.o scheduler.o
+
+PL_0_TEST_OBJECTS=PL0_utils.o svc.o PL0_test.o strings.o io.o
+
+LOADER_STAGE2_OBJECTS=uart.o strings.o io.o loader_stage2.o
+
+RAMFS_FILES=PL0_test.img
+
+all : kernel.img
+
+empty:=
+space:= $(empty) $(empty)
+
+dirs:=$(shell find ../src/ -type d)
+dirs_colon:=$(subst $(space),:,$(dirs))
+vpath %.S $(dirs_colon)
+vpath %.c $(dirs_colon)
+vpath %.ld $(dirs_colon)
+
+echo :
+	echo $(VPATH)
+	echo $(CFLAGS)
+
+%.o : %.c
+	arm-none-eabi-gcc $(CFLAGS) -c $^ -o $@
+
+%.img : %.elf
+	arm-none-eabi-objcopy $^ -O binary $@
+
+%.o: %.S
+	arm-none-eabi-as -mcpu=cortex-a7 $^ -o $@
+
+%_embeddable.o : %.img
+	arm-none-eabi-objcopy -I binary -O elf32-littlearm -B arm  $^ $@
+
+%.elf : %.ld
+	arm-none-eabi-gcc -T $< -o $@ $(ELFFLAGS) $(filter %.o,$^)
+
+PL0_test.elf : $(PL_0_TEST_OBJECTS)
+
+kernel.elf : kernel_stage1.o
+
+kernel_stage2.elf : $(KERNEL_STAGE2_OBJECTS)
+
+loader_stage2.elf : $(LOADER_STAGE2_OBJECTS)
+
+loader.elf : loader_stage1.o
+
+kernel_stage1.o : kernel_stage1.S kernel_stage2.img
+	arm-none-eabi-as -mcpu=cortex-a7 $< -o $@
+
+loader_stage1.o : loader_stage1.S  loader_stage2.img
+	arm-none-eabi-as -mcpu=cortex-a7 $< -o $@
+
+qemu-elf : kernel.elf
+	qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^
+
+qemu-bin : kernel.img
+	qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^
+
+qemu-loader : loader.img kernel.img pipe_image
+	./pipe_image --stdout | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $<
+
+run-on-rpi : kernel.img pipe_image
+	./pipe_image --stdout | sudo socat FILE:/dev/ttyUSB0,b115200,raw -
+	screen  /dev/ttyUSB0 115200,cs8,-parenb,-cstopb,-hupcl
+
+pipe_image : pipe_image.c rs232.c
+	gcc -Wall -std=gnu99 -I../src/lib/rs232 -O3 $^ -o $@
+
+makefs : makefs.c
+	gcc -Wall -std=gnu99 -O3 $^ -o $@
+
+ramfs.img : makefs $(RAMFS_FILES)
+	./makefs $(RAMFS_FILES) > $@
+
+clean :
+	-rm -f *.img *.elf *.o pipe_image makefs
+
+.PHONY: all qemu-elf qemu-bin clean