Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v10 / boot / rescue / head.S

diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S
index cf644e2d6aa2322cf899158a7cc616bff83e85b3..fb503d1eeea4be2dd06bf8c26f05dc9b433601b5 100644 (file)
--- a/arch/cris/arch-v10/boot/rescue/head.S
+++ b/arch/cris/arch-v10/boot/rescue/head.S
@@ -65,7 +65,7 @@
 #ifdef CONFIG_ETRAX_AXISFLASHMAP
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
        ;; The partitiontable is looked for at the first sector after the boot
        ;; sector. Sector size is 65536 bytes in all flashes we use.
@@ -74,11 +74,12 @@
 #define PTABLE_MAGIC 0xbeef
 
        ;; The normal Etrax100 on-chip boot ROM does serial boot at 0x380000f0.
-       ;; That is not where we put our downloaded serial boot-code. The length is
-       ;; enough for downloading code that loads the rest of itself (after
-       ;; having setup the DRAM etc). It is the same length as the on-chip
-       ;; ROM loads, so the same host loader can be used to load a rescued
-       ;; product as well as one booted through the Etrax serial boot code.
+       ;; That is not where we put our downloaded serial boot-code.
+       ;; The length is enough for downloading code that loads the rest
+       ;; of itself (after having setup the DRAM etc).
+       ;; It is the same length as the on-chip ROM loads, so the same
+       ;; host loader can be used to load a rescued product as well as
+       ;; one booted through the Etrax serial boot code.
 
 #define CODE_START 0x40000000
 #define CODE_LENGTH 784
@@ -330,7 +331,8 @@ checksum:
        moveq   0, $r0
        moveq   CONFIG_ETRAX_FLASH1_SIZE, $r6
 
-       ;; If the first physical flash memory is exceeded wrap to the second one
+       ;; If the first physical flash memory is exceeded wrap to the
+       ;; second one
        btstq   26, $r1         ; Are we addressing first flash?
        bpl     1f
        nop