Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84963
b: refs/heads/master
c: 99bb22b
h: refs/heads/master
i:
  84961: 34efe7b
  84959: a5aa95d
v: v3
  • Loading branch information
Jesper Nilsson committed Feb 8, 2008
1 parent e221fa3 commit f4af7c1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7cda01268559b788b695caee66511ae8d2f0bdf9
refs/heads/master: 99bb22bd284bcc6aa5efe2728f4ecafa5146e4f8
14 changes: 8 additions & 6 deletions trunk/arch/cris/arch-v10/boot/rescue/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f4af7c1

Please sign in to comment.