Small fixes
authorAlyssa Rosenzweig <alyssa@backtick.town>
Tue, 6 Sep 2016 22:42:01 +0000 (15:42 -0700)
committerAlyssa Rosenzweig <alyssa@backtick.town>
Tue, 6 Sep 2016 22:42:01 +0000 (15:42 -0700)
arm_chainloader/Makefile
arm_chainloader/loader.cc

index bae9174..164ec06 100644 (file)
@@ -3,6 +3,7 @@ TARGET_ARM_CHAINLOADER = arm_chainloader.bin
 
 SRCS = \
        start.s \
+       boot.s \
        lib/arm_bcopy.s \
        lib/arm_bzero.s \
        lib/arm_locore.s \
@@ -89,4 +90,4 @@ $(TARGET_ARM_CHAINLOADER): create_build_directory $(OBJ)
 
 clean:
        @echo $(ERROR_COLOR)CLEAN$(NO_COLOR)
-       @-rm -rf ./$(BUILD_DIR)
\ No newline at end of file
+       @-rm -rf ./$(BUILD_DIR)
index 4c8d36e..41da0d4 100644 (file)
@@ -88,18 +88,18 @@ struct LoaderImpl {
                 printf("DTB loaded at %X\n", dtb);
 
                 /* read the kernel */
-                uint8_t* bzImage;
+                uint8_t* zImage;
 
-                if(!read_file("bzImage", bzImage)) {
-                    panic("Error reading bzImage");
+                if(!read_file("zImage", zImage)) {
+                    panic("Error reading zImage");
                 }
 
-                printf("bzImage loaded at %X\n", bzImage);
+                printf("bzImage loaded at %X\n", zImage);
 
                 printf("Jumping to the Linux kernel...\n");
                 
                 /* this should never return */
-                bootLinux(0, 3139, dtb, bzImage);
+                bootLinux(0, 3139, dtb, zImage);
        }
 };
 
This page took 0.025413 seconds and 4 git commands to generate.