io api rework

1 files changed, 6 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index c3fc2f1..1e8f8fe 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,11 @@ 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
+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
 
-PL_0_TEST_OBJECTS=PL0_utils.o svc.o PL0_test.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=PL_0_test.img
 
@@ -41,8 +43,8 @@ kernel_stage2.elf : kernel_stage2.ld $(KERNEL_STAGE2_OBJECTS)
 #kernel.elf : boot.o kernel.o uart.o demo_functionality.o paging.o interrupt_vector.o interrupts.o ramfs_embeddable.o ramfs.o
 #	arm-none-eabi-gcc -T linker.ld -o $@ $(ELFFLAGS) $^
 
-loader_stage2.elf : loader_stage2.o uart.o
-	arm-none-eabi-gcc -T loader_stage2_linker.ld -o $@ $(ELFFLAGS) $^
+loader_stage2.elf : loader_stage2_linker.ld $(LOADER_STAGE2_OBJECTS)
+	arm-none-eabi-gcc -T $< -o $@ $(ELFFLAGS) $(LOADER_STAGE2_OBJECTS)
 
 loader_stage1.o : loader_stage1.S  loader_stage2.img
 	arm-none-eabi-as -mcpu=cortex-a7 $< -o $@