armv8: cleanup.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/kernel/arch/apm88xxxx/init.c b/kernel/arch/apm88xxxx/init.c
index 463f003..8450cd6 100644 (file)
--- a/kernel/arch/apm88xxxx/init.c
+++ b/kernel/arch/apm88xxxx/init.c
@@ -27,9 +27,9 @@ static void paging_dump(void)
             for (int j = 0; j < 512; j++) {
                 union armv8_ttable_entry *entry1 = lvl1 + j;
                 if (entry1->d.valid && entry1->d.mb1) {
-                    printf("%d: level 1 table @%lx\n", i, (entry1->d.base)<<BASE_PAGE_BITS);
+                    printf("  %d: level 2 table @%lx\n", j, (entry1->d.base)<<BASE_PAGE_BITS);
                 } else if (entry1->block_l1.valid) {
-                    printf("%d: level 1 block @%lx\n", i,
+                    printf("  %d: level 1 block @%lx\n", j,
                             (entry1->block_l1.base) << HUGE_PAGE_BITS);
                 }
             }
@@ -44,8 +44,8 @@ void arch_init(void *pointer, EFI_MEMORY_DESCRIPTOR *uefi_mmap);
 // Currently
 void arch_init(void *pointer, EFI_MEMORY_DESCRIPTOR *uefi_mmap)
 {
-    // break to attach gdb here
-    __asm volatile ("wfi":::);
+    // uncomment line below to force wait to attach gdb here
+    // __asm volatile ("wfi":::);
 
     // set both console ports: UART0 is the one that's connected to the DB9
     // connector on the back of the mustang boxes.

diff --git a/kernel/arch/apm88xxxx/uart.c b/kernel/arch/apm88xxxx/uart.c
index 92f8869..a2eaa01 100644 (file)
--- a/kernel/arch/apm88xxxx/uart.c
+++ b/kernel/arch/apm88xxxx/uart.c
@@ -25,7 +25,7 @@ static apm88xxxx_pc16550_t ports[NUM_PORTS];
 errval_t serial_init(unsigned port, bool initialize_hw)
 {
     // XXX: remove once we have data section
-    //port = 0;
+    port = 0;
     if (port >= NUM_PORTS) {
         return SYS_ERR_SERIAL_PORT_INVALID;
     }
@@ -61,7 +61,7 @@ errval_t serial_early_init(unsigned port)
 void serial_putchar(unsigned port, char c)
 {
     // XXX: remove once we have data section
-    //port = 0;
+    port = 0;
     assert(port < NUM_PORTS);
     assert(ports[port].base != 0);
     // Wait until FIFO can hold more characters