Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice

# Conflicts:
#	Makefile
#	PL0_test.c
#	kernel.c
#	linker.ld

1 files changed, 7 insertions, 2 deletions

diff --git a/kernel.c b/kernel.c
index 95d803d..1a54fcf 100644
--- a/kernel.c
+++ b/kernel.c
@@ -29,11 +29,16 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags)
   // prints some info and sets upp translation table, turns on MMU
   setup_flat_map();
 
+  demo_setup_libkernel();
+
+  demo_setup_PL0();
+
+  demo_setup_interrupts();
+  
   // prints some info and sets up a section for PL0 code, loads a blob
   // there and jumps to it... never, ever, ever returns
   demo_go_unprivileged();
-
-
+  
   while(1);
   
   while (1)