diff options
Diffstat (limited to 'arch/cris/arch-v10/boot')
-rw-r--r-- | arch/cris/arch-v10/boot/rescue/head.S | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S index cf644e2d6aa2..6ba7be8ac4a0 100644 --- a/arch/cris/arch-v10/boot/rescue/head.S +++ b/arch/cris/arch-v10/boot/rescue/head.S | |||
@@ -74,11 +74,12 @@ | |||
74 | #define PTABLE_MAGIC 0xbeef | 74 | #define PTABLE_MAGIC 0xbeef |
75 | 75 | ||
76 | ;; The normal Etrax100 on-chip boot ROM does serial boot at 0x380000f0. | 76 | ;; The normal Etrax100 on-chip boot ROM does serial boot at 0x380000f0. |
77 | ;; That is not where we put our downloaded serial boot-code. The length is | 77 | ;; That is not where we put our downloaded serial boot-code. |
78 | ;; enough for downloading code that loads the rest of itself (after | 78 | ;; The length is enough for downloading code that loads the rest |
79 | ;; having setup the DRAM etc). It is the same length as the on-chip | 79 | ;; of itself (after having setup the DRAM etc). |
80 | ;; ROM loads, so the same host loader can be used to load a rescued | 80 | ;; It is the same length as the on-chip ROM loads, so the same |
81 | ;; product as well as one booted through the Etrax serial boot code. | 81 | ;; host loader can be used to load a rescued product as well as |
82 | ;; one booted through the Etrax serial boot code. | ||
82 | 83 | ||
83 | #define CODE_START 0x40000000 | 84 | #define CODE_START 0x40000000 |
84 | #define CODE_LENGTH 784 | 85 | #define CODE_LENGTH 784 |
@@ -330,7 +331,8 @@ checksum: | |||
330 | moveq 0, $r0 | 331 | moveq 0, $r0 |
331 | moveq CONFIG_ETRAX_FLASH1_SIZE, $r6 | 332 | moveq CONFIG_ETRAX_FLASH1_SIZE, $r6 |
332 | 333 | ||
333 | ;; If the first physical flash memory is exceeded wrap to the second one | 334 | ;; If the first physical flash memory is exceeded wrap to the |
335 | ;; second one | ||
334 | btstq 26, $r1 ; Are we addressing first flash? | 336 | btstq 26, $r1 ; Are we addressing first flash? |
335 | bpl 1f | 337 | bpl 1f |
336 | nop | 338 | nop |