A bit of cleanup
authorAlyssa Rosenzweig <alyssa@backtick.town>
Thu, 25 Aug 2016 02:32:13 +0000 (19:32 -0700)
committerAlyssa Rosenzweig <alyssa@backtick.town>
Thu, 25 Aug 2016 02:32:13 +0000 (19:32 -0700)
arm_chainloader/drivers/mbr_disk.cc
arm_chainloader/main.c

index 01c238a..e60ddbc 100644 (file)
@@ -119,7 +119,7 @@ struct MbrImpl {
                }\r
 \r
                if (!validate_signature()) {\r
-                                       panic("invalid master boot record signature (got 0x%x)", mbr->mbr_sig);\r
+                        panic("invalid master boot record signature (got 0x%x)", mbr->mbr_sig);\r
                }\r
 \r
                logf("MBR contents:\n");\r
index 00ee7a1..8dd9d31 100644 (file)
@@ -35,20 +35,14 @@ void main() {
 \r
        heap_init();\r
 \r
-       /* c++ runtime */\r
-//     cxx_init();\r
-\r
         /* poke the VPU */\r
-/*        __asm__ volatile("mov r3, #0\n" \\r
-                         "mcr p15, 0, r3, C7, C6, 0\n" \\r
-                         "mcr p15, 0, r3, C7, C10, 0\n" \\r
-                         "mcr p15, 0, r3, C7, C14, 0\n" \\r
-                         "mcr p15, 0, r3, C7, C10, 4\n" \\r
-                         "mcr p15, 0, r3, C7, C10, 5\n");*/\r
         printf("\nPoking the VPU....\n");\r
         mmio_write32(0x7E00B8A0, 0xA1755A01);\r
 \r
-       panic("Nothing else to do!");\r
+       /* c++ runtime */\r
+       cxx_init();\r
+\r
+        panic("Nothing else to do!");\r
 \r
 #if 0\r
        printf("Done ");\r
This page took 0.03085 seconds and 4 git commands to generate.