Skip to content

L
linux-davinci
Commit 8c11bffa authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files
Options

CRIS v10: Update rescue head.s 

- Correct whitespace problems.
- Add ifdef for ETRAX_AXISFLASHMAP to avoid compile error when not set.
parent 63e6b9a0
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 56 deletions
arch/cris/arch-v10/boot/rescue/head.S
View file @ 8c11bffa
/* $Id: head.S,v 1.7 2005/03/07 12:11:06 starvik Exp $ /*
*
* Rescue code, made to reside at the beginning of the * Rescue code, made to reside at the beginning of the
* flash-memory. when it starts, it checks a partition * flash-memory. when it starts, it checks a partition
* table at the first sector after the rescue sector. * table at the first sector after the rescue sector.
...@@ -23,20 +22,20 @@ ...@@ -23,20 +22,20 @@
* Partition table format: * Partition table format:
* *
* Code transparency: * Code transparency:
* *
* 2 bytes [opcode 'nop'] * 2 bytes [opcode 'nop']
* 2 bytes [opcode 'di'] * 2 bytes [opcode 'di']
* 4 bytes [opcode 'ba <offset>', 8-bit or 16-bit version] * 4 bytes [opcode 'ba <offset>', 8-bit or 16-bit version]
* 2 bytes [opcode 'nop', delay slot] * 2 bytes [opcode 'nop', delay slot]
* *
* Table validation (at +10): * Table validation (at +10):
* *
* 2 bytes [magic/version word for partitiontable - 0xef, 0xbe] * 2 bytes [magic/version word for partitiontable - 0xef, 0xbe]
* 2 bytes [length of all entries plus the end marker] * 2 bytes [length of all entries plus the end marker]
* 4 bytes [checksum for the partitiontable itself] * 4 bytes [checksum for the partitiontable itself]
* *
* Entries, each with the following format, last has offset -1: * Entries, each with the following format, last has offset -1:
* *
* 4 bytes [offset in bytes, from start of flash] * 4 bytes [offset in bytes, from start of flash]
* 4 bytes [length in bytes of partition] * 4 bytes [length in bytes of partition]
* 4 bytes [checksum, simple longword sum] * 4 bytes [checksum, simple longword sum]
...@@ -47,9 +46,9 @@ ...@@ -47,9 +46,9 @@
* End marker * End marker
* *
* 4 bytes [-1] * 4 bytes [-1]
* *
* 10 bytes [0, padding] * 10 bytes [0, padding]
* *
* Bit 0 in flags signifies RW or RO. The rescue code only bothers * Bit 0 in flags signifies RW or RO. The rescue code only bothers
* to check the checksum for RO partitions, since the others will * to check the checksum for RO partitions, since the others will
* change their data without updating the checksums. A 1 in bit 0 * change their data without updating the checksums. A 1 in bit 0
...@@ -59,16 +58,18 @@ ...@@ -59,16 +58,18 @@
* *
* During the wait for serial input, the status LED will flash so the * During the wait for serial input, the status LED will flash so the
* user knows something went wrong. * user knows something went wrong.
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003 Axis Communications AB * Copyright (C) 1999-2007 Axis Communications AB
*/ */
#ifdef CONFIG_ETRAX_AXISFLASHMAP
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
#include <asm/arch/sv_addr_ag.h> #include <asm/arch/sv_addr_ag.h>
;; The partitiontable is looked for at the first sector after the boot ;; The partitiontable is looked for at the first sector after the boot
;; sector. Sector size is 65536 bytes in all flashes we use. ;; sector. Sector size is 65536 bytes in all flashes we use.
#define PTABLE_START CONFIG_ETRAX_PTABLE_SECTOR #define PTABLE_START CONFIG_ETRAX_PTABLE_SECTOR
#define PTABLE_MAGIC 0xbeef #define PTABLE_MAGIC 0xbeef
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
;; having setup the DRAM etc). It is the same length as the on-chip ;; 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 ;; 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. ;; product as well as one booted through the Etrax serial boot code.
#define CODE_START 0x40000000 #define CODE_START 0x40000000
#define CODE_LENGTH 784 #define CODE_LENGTH 784
...@@ -102,7 +103,7 @@ ...@@ -102,7 +103,7 @@
#define SERRECC R_SERIAL2_REC_CTRL #define SERRECC R_SERIAL2_REC_CTRL
#define SERRDAT R_SERIAL2_REC_DATA #define SERRDAT R_SERIAL2_REC_DATA
#define SERSTAT R_SERIAL2_STATUS #define SERSTAT R_SERIAL2_STATUS
#endif #endif
#ifdef CONFIG_ETRAX_RESCUE_SER3 #ifdef CONFIG_ETRAX_RESCUE_SER3
#define SERXOFF R_SERIAL3_XOFF #define SERXOFF R_SERIAL3_XOFF
#define SERBAUD R_SERIAL3_BAUD #define SERBAUD R_SERIAL3_BAUD
...@@ -115,60 +116,61 @@ ...@@ -115,60 +116,61 @@
#define RAM_INIT_MAGIC 0x56902387 #define RAM_INIT_MAGIC 0x56902387
.text .text
;; This is the entry point of the rescue code ;; This is the entry point of the rescue code
;; 0x80000000 if loaded in flash (as it should be) ;; 0x80000000 if loaded in flash (as it should be)
;; since etrax actually starts at address 2 when booting from flash, we ;; Since etrax actually starts at address 2 when booting from flash, we
;; put a nop (2 bytes) here first so we dont accidentally skip the di ;; put a nop (2 bytes) here first so we dont accidentally skip the di
nop nop
di di
jump in_cache ; enter cached area instead jump in_cache ; enter cached area instead
in_cache: in_cache:
;; first put a jump test to give a possibility of upgrading the rescue code ;; First put a jump test to give a possibility of upgrading the
;; without erasing/reflashing the sector. we put a longword of -1 here and if ;; rescue code without erasing/reflashing the sector.
;; it is not -1, we jump using the value as jump target. since we can always ;; We put a longword of -1 here and if it is not -1, we jump using
;; change 1's to 0's without erasing the sector, it is possible to add new ;; the value as jump target. Since we can always change 1's to 0's
;; without erasing the sector, it is possible to add new
;; code after this and altering the jumptarget in an upgrade. ;; code after this and altering the jumptarget in an upgrade.
jtcd: move.d [jumptarget], $r0 jtcd: move.d [jumptarget], $r0
cmp.d 0xffffffff, $r0 cmp.d 0xffffffff, $r0
beq no_newjump beq no_newjump
nop nop
jump [$r0] jump [$r0]
jumptarget: jumptarget:
.dword 0xffffffff ; can be overwritten later to insert new code .dword 0xffffffff ; can be overwritten later to insert new code
no_newjump: no_newjump:
#ifdef CONFIG_ETRAX_ETHERNET #ifdef CONFIG_ETRAX_ETHERNET
;; Start MII clock to make sure it is running when tranceiver is reset ;; Start MII clock to make sure it is running when tranceiver is reset
move.d 0x3, $r0 ; enable = on, phy = mii_clk move.d 0x3, $r0 ; enable = on, phy = mii_clk
move.d $r0, [R_NETWORK_GEN_CONFIG] move.d $r0, [R_NETWORK_GEN_CONFIG]
#endif #endif
;; We need to setup the bus registers before we start using the DRAM ;; We need to setup the bus registers before we start using the DRAM
#include "../../lib/dram_init.S" #include "../../lib/dram_init.S"
;; we now should go through the checksum-table and check the listed ;; we now should go through the checksum-table and check the listed
;; partitions for errors. ;; partitions for errors.
move.d PTABLE_START, $r3 move.d PTABLE_START, $r3
move.d [$r3], $r0 move.d [$r3], $r0
cmp.d NOP_DI, $r0 ; make sure the nop/di is there... cmp.d NOP_DI, $r0 ; make sure the nop/di is there...
bne do_rescue bne do_rescue
nop nop
;; skip the code transparency block (10 bytes). ;; skip the code transparency block (10 bytes).
addq 10, $r3 addq 10, $r3
;; check for correct magic ;; check for correct magic
move.w [$r3+], $r0 move.w [$r3+], $r0
cmp.w PTABLE_MAGIC, $r0 cmp.w PTABLE_MAGIC, $r0
bne do_rescue ; didn't recognize - trig rescue bne do_rescue ; didn't recognize - trig rescue
...@@ -186,11 +188,11 @@ no_newjump: ...@@ -186,11 +188,11 @@ no_newjump:
cmp.d $r0, $r4 cmp.d $r0, $r4
bne do_rescue ; didn't match - trig rescue bne do_rescue ; didn't match - trig rescue
nop nop
;; ptable is ok. validate each entry. ;; ptable is ok. validate each entry.
moveq -1, $r7 moveq -1, $r7
ploop: move.d [$r3+], $r1 ; partition offset (from ptable start) ploop: move.d [$r3+], $r1 ; partition offset (from ptable start)
bne notfirst ; check if it is the partition containing ptable bne notfirst ; check if it is the partition containing ptable
nop ; yes.. nop ; yes..
...@@ -199,7 +201,7 @@ ploop: move.d [$r3+], $r1 ; partition offset (from ptable start) ...@@ -199,7 +201,7 @@ ploop: move.d [$r3+], $r1 ; partition offset (from ptable start)
sub.d $r8, $r2 ; minus the ptable length sub.d $r8, $r2 ; minus the ptable length
ba bosse ba bosse
nop nop
notfirst: notfirst:
cmp.d -1, $r1 ; the end of the ptable ? cmp.d -1, $r1 ; the end of the ptable ?
beq flash_ok ; if so, the flash is validated beq flash_ok ; if so, the flash is validated
move.d [$r3+], $r2 ; partition length move.d [$r3+], $r2 ; partition length
...@@ -213,47 +215,46 @@ bosse: move.d [$r3+], $r5 ; checksum ...@@ -213,47 +215,46 @@ bosse: move.d [$r3+], $r5 ; checksum
bpl 1f bpl 1f
nop nop
move.d $r1, $r7 ; remember boot partition offset move.d $r1, $r7 ; remember boot partition offset
1: 1:
add.d PTABLE_START, $r1 add.d PTABLE_START, $r1
jsr checksum ; checksum the partition jsr checksum ; checksum the partition
cmp.d $r0, $r5 cmp.d $r0, $r5
beq ploop ; checksums matched, go to next entry beq ploop ; checksums matched, go to next entry
nop nop
;; otherwise fall through to the rescue code. ;; otherwise fall through to the rescue code.
do_rescue: do_rescue:
;; setup port PA and PB default initial directions and data ;; setup port PA and PB default initial directions and data
;; (so we can flash LEDs, and so that DTR and others are set) ;; (so we can flash LEDs, and so that DTR and others are set)
move.b CONFIG_ETRAX_DEF_R_PORT_PA_DIR, $r0 move.b CONFIG_ETRAX_DEF_R_PORT_PA_DIR, $r0
move.b $r0, [R_PORT_PA_DIR] move.b $r0, [R_PORT_PA_DIR]
move.b CONFIG_ETRAX_DEF_R_PORT_PA_DATA, $r0 move.b CONFIG_ETRAX_DEF_R_PORT_PA_DATA, $r0
move.b $r0, [R_PORT_PA_DATA] move.b $r0, [R_PORT_PA_DATA]
move.b CONFIG_ETRAX_DEF_R_PORT_PB_DIR, $r0 move.b CONFIG_ETRAX_DEF_R_PORT_PB_DIR, $r0
move.b $r0, [R_PORT_PB_DIR] move.b $r0, [R_PORT_PB_DIR]
move.b CONFIG_ETRAX_DEF_R_PORT_PB_DATA, $r0 move.b CONFIG_ETRAX_DEF_R_PORT_PB_DATA, $r0
move.b $r0, [R_PORT_PB_DATA] move.b $r0, [R_PORT_PB_DATA]
;; setup the serial port at 115200 baud ;; setup the serial port at 115200 baud
moveq 0, $r0 moveq 0, $r0
move.d $r0, [SERXOFF] move.d $r0, [SERXOFF]
move.b 0x99, $r0 move.b 0x99, $r0
move.b $r0, [SERBAUD] ; 115.2kbaud for both transmit and receive move.b $r0, [SERBAUD] ; 115.2kbaud for both transmit and receive
move.b 0x40, $r0 ; rec enable move.b 0x40, $r0 ; rec enable
move.b $r0, [SERRECC] move.b $r0, [SERRECC]
moveq 0, $r1 ; "timer" to clock out a LED red flash moveq 0, $r1 ; "timer" to clock out a LED red flash
move.d CODE_START, $r3 ; destination counter move.d CODE_START, $r3 ; destination counter
movu.w CODE_LENGTH, $r4; length movu.w CODE_LENGTH, $r4; length
wait_ser: wait_ser:
addq 1, $r1 addq 1, $r1
#ifndef CONFIG_ETRAX_NO_LEDS #ifndef CONFIG_ETRAX_NO_LEDS
...@@ -272,20 +273,20 @@ wait_ser: ...@@ -272,20 +273,20 @@ wait_ser:
nop nop
1: not $r0 ; clear bit 1: not $r0 ; clear bit
and.d $r0, $r2 and.d $r0, $r2
2: 2:
#ifdef CONFIG_ETRAX_PA_LEDS #ifdef CONFIG_ETRAX_PA_LEDS
move.b $r2, [R_PORT_PA_DATA] move.b $r2, [R_PORT_PA_DATA]
#endif #endif
#ifdef CONFIG_ETRAX_PB_LEDS #ifdef CONFIG_ETRAX_PB_LEDS
move.b $r2, [R_PORT_PB_DATA] move.b $r2, [R_PORT_PB_DATA]
#endif #endif
#ifdef CONFIG_ETRAX_90000000_LEDS #ifdef CONFIG_ETRAX_90000000_LEDS
move.b $r2, [0x90000000] move.b $r2, [0x90000000]
#endif #endif
#endif #endif
;; check if we got something on the serial port ;; check if we got something on the serial port
move.b [SERSTAT], $r0 move.b [SERSTAT], $r0
btstq 0, $r0 ; data_avail btstq 0, $r0 ; data_avail
bpl wait_ser bpl wait_ser
...@@ -295,14 +296,15 @@ wait_ser: ...@@ -295,14 +296,15 @@ wait_ser:
move.b [SERRDAT], $r0 move.b [SERRDAT], $r0
move.b $r0, [$r3+] move.b $r0, [$r3+]
subq 1, $r4 ; decrease length subq 1, $r4 ; decrease length
bne wait_ser bne wait_ser
nop nop
;; jump into downloaded code ;; jump into downloaded code
move.d RAM_INIT_MAGIC, $r8 ; Tell next product that DRAM is initialized move.d RAM_INIT_MAGIC, $r8 ; Tell next product that DRAM is
; initialized
jump CODE_START jump CODE_START
flash_ok: flash_ok:
...@@ -313,7 +315,8 @@ flash_ok: ...@@ -313,7 +315,8 @@ flash_ok:
nop nop
move.d PTABLE_START, $r7; otherwise use the ptable start move.d PTABLE_START, $r7; otherwise use the ptable start
1: 1:
move.d RAM_INIT_MAGIC, $r8 ; Tell next product that DRAM is initialized move.d RAM_INIT_MAGIC, $r8 ; Tell next product that DRAM is
; initialized
jump $r7 ; boot! jump $r7 ; boot!
...@@ -327,7 +330,7 @@ checksum: ...@@ -327,7 +330,7 @@ checksum:
moveq 0, $r0 moveq 0, $r0
moveq CONFIG_ETRAX_FLASH1_SIZE, $r6 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? btstq 26, $r1 ; Are we addressing first flash?
bpl 1f bpl 1f
nop nop
...@@ -351,3 +354,5 @@ checksum: ...@@ -351,3 +354,5 @@ checksum:
3: move.d MEM_CSE1_START, $r1 ; wrap to second flash 3: move.d MEM_CSE1_START, $r1 ; wrap to second flash
ba 2b ba 2b
nop nop
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment