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

# Conflicts:
#	kernel.c

1 files changed, 5 insertions, 3 deletions

diff --git a/kernel.c b/kernel.c
index a6f8790..096cd9a 100644
--- a/kernel.c
+++ b/kernel.c
@@ -15,7 +15,7 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags)
   // When we attach screen session after loading kernel with socat
   // we miss kernel's greeting... So we'll make the kernel wait for
   // one char we're going to send from within screen
-  //  uart_getc();
+  uart_getc();
   
   uart_puts("Hello, kernel World!\r\n");
 
@@ -26,13 +26,15 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags)
 
   // prints some info and switches to system mode
   demo_mode_to_system();
+  // prints some info
+  demo_current_mode();
 
   // prints some info and sets upp translation table, turns on MMU
   setup_flat_map();
 
-//  demo_setup_libkernel();
+  demo_setup_libkernel();
 
-//  demo_setup_PL0();
+  demo_setup_PL0();
     enable_timer();
 
     // enable interrupts