From f4af7c18301ddf7d14446eb22ef13a2bbfa49be8 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Fri, 18 Jan 2008 13:48:02 +0100 Subject: [PATCH] --- yaml --- r: 84963 b: refs/heads/master c: 99bb22bd284bcc6aa5efe2728f4ecafa5146e4f8 h: refs/heads/master i: 84961: 34efe7b944cc958e4fb334effea152ca6f7573a0 84959: a5aa95de1d9eb21cb122d57d52de5c8b4bccf4c4 v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/boot/rescue/head.S | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c509bfed537f..0fc85187759c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cda01268559b788b695caee66511ae8d2f0bdf9 +refs/heads/master: 99bb22bd284bcc6aa5efe2728f4ecafa5146e4f8 diff --git a/trunk/arch/cris/arch-v10/boot/rescue/head.S b/trunk/arch/cris/arch-v10/boot/rescue/head.S index cf644e2d6aa2..6ba7be8ac4a0 100644 --- a/trunk/arch/cris/arch-v10/boot/rescue/head.S +++ b/trunk/arch/cris/arch-v10/boot/rescue/head.S @@ -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