Mercurial > flash_v2
annotate packages/redboot/current/src/flash.c @ 1777:c16341b1bac6 default tip
* Added execute permissions to files missed in conversion from CVS
| author | alexs |
|---|---|
| date | Mon, 12 Oct 2009 02:26:09 +0100 |
| parents | 172edf8a96d8 |
| children |
| rev | line source |
|---|---|
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1 //========================================================================== |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
2 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
3 // flash.c |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
4 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
5 // RedBoot - FLASH memory support |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
6 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
7 //========================================================================== |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
8 //####ECOSGPLCOPYRIGHTBEGIN#### |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
9 // ------------------------------------------- |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
10 // This file is part of eCos, the Embedded Configurable Operating System. |
| 849 | 11 // Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc. |
|
1605
43a89c18d005
Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems.
gthomas
parents:
1513
diff
changeset
|
12 // Copyright (C) 2003, 2004 Gary Thomas |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
13 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
14 // eCos is free software; you can redistribute it and/or modify it under |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
15 // the terms of the GNU General Public License as published by the Free |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
16 // Software Foundation; either version 2 or (at your option) any later version. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
17 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
18 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
19 // WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
20 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
21 // for more details. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
22 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
23 // You should have received a copy of the GNU General Public License along |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
24 // with eCos; if not, write to the Free Software Foundation, Inc., |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
25 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
26 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
27 // As a special exception, if other files instantiate templates or use macros |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
28 // or inline functions from this file, or you compile this file and link it |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
29 // with other works to produce a work based on this file, this file does not |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
30 // by itself cause the resulting work to be covered by the GNU General Public |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
31 // License. However the source code for this file must still be made available |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
32 // in accordance with section (3) of the GNU General Public License. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
33 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
34 // This exception does not invalidate any other reasons why a work based on |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
35 // this file might be covered by the GNU General Public License. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
36 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
37 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc. |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
38 // at http://sources.redhat.com/ecos/ecos-license/ |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
39 // ------------------------------------------- |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
40 //####ECOSGPLCOPYRIGHTEND#### |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
41 //========================================================================== |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
42 //#####DESCRIPTIONBEGIN#### |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
43 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
44 // Author(s): gthomas |
|
307
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
45 // Contributors: gthomas, tkoeller |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
46 // Date: 2000-07-28 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
47 // Purpose: |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
48 // Description: |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
49 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
50 // This code is part of RedBoot (tm). |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
51 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
52 //####DESCRIPTIONEND#### |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
53 // |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
54 //========================================================================== |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
55 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
56 #include <redboot.h> |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
57 #include <cyg/io/flash.h> |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
58 #include <fis.h> |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
59 #include <sib.h> |
|
1605
43a89c18d005
Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems.
gthomas
parents:
1513
diff
changeset
|
60 #include <cyg/infra/cyg_ass.h> // assertion macros |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
61 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
62 #ifdef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
63 // Note horrid intertwining of functions, to save precious FLASH |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
64 #endif |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
65 |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
66 // Round a quantity up |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
67 #define _rup(n,s) ((((n)+(s-1))/s)*s) |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
68 |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
69 #ifdef CYGOPT_REDBOOT_FIS |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
70 // Image management functions |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
71 local_cmd_entry("init", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
72 "Initialize FLASH Image System [FIS]", |
|
117
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
73 "[-f]", |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
74 fis_init, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
75 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
76 ); |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
77 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
78 # define FIS_LIST_OPTS "[-c] [-d]" |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
79 #else |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
80 # define FIS_LIST_OPTS "[-d]" |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
81 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
82 local_cmd_entry("list", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
83 "Display contents of FLASH Image System [FIS]", |
|
174
38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
jlarmour
parents:
172
diff
changeset
|
84 FIS_LIST_OPTS, |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
85 fis_list, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
86 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
87 ); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
88 local_cmd_entry("free", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
89 "Display free [available] locations within FLASH Image System [FIS]", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
90 "", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
91 fis_free, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
92 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
93 ); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
94 local_cmd_entry("delete", |
| 388 | 95 "Delete an image from FLASH Image System [FIS]", |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
96 "name", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
97 fis_delete, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
98 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
99 ); |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
100 |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
101 static char fis_load_usage[] = |
|
1492
8b3549abe4ac
* cdl/redboot.cdl: Bring CYGNUM_REDBOOT_LOAD_ZLIB_BUFFER under
jlarmour
parents:
1393
diff
changeset
|
102 #ifdef CYGPRI_REDBOOT_ZLIB_FLASH |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
103 "[-d] " |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
104 #endif |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
105 "[-b <memory_load_address>] [-c] name"; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
106 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
107 local_cmd_entry("load", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
108 "Load image from FLASH Image System [FIS] into RAM", |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
109 fis_load_usage, |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
110 fis_load, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
111 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
112 ); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
113 local_cmd_entry("create", |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
114 "Create an image", |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
115 "-b <mem_base> -l <image_length> [-s <data_length>]\n" |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
116 " [-f <flash_addr>] [-e <entry_point>] [-r <ram_addr>] [-n] <name>", |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
117 fis_create, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
118 FIS_cmds |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
119 ); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
120 #endif |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
121 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
122 // Raw flash access functions |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
123 local_cmd_entry("erase", |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
124 "Erase FLASH contents", |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
125 "-f <flash_addr> -l <length>", |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
126 fis_erase, |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
127 FIS_cmds |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
128 ); |
|
177
4c750ce71ae3
Merge from eCos master repository on 2001-08-10-19:22:57-BST
jlarmour
parents:
174
diff
changeset
|
129 #ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
130 local_cmd_entry("lock", |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
131 "LOCK FLASH contents", |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
132 "[-f <flash_addr> -l <length>] [name]", |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
133 fis_lock, |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
134 FIS_cmds |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
135 ); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
136 local_cmd_entry("unlock", |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
137 "UNLOCK FLASH contents", |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
138 "[-f <flash_addr> -l <length>] [name]", |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
139 fis_unlock, |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
140 FIS_cmds |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
141 ); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
142 #endif |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
143 local_cmd_entry("write", |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
144 "Write raw data directly to FLASH", |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
145 "-f <flash_addr> -b <mem_base> -l <image_length>", |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
146 fis_write, |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
147 FIS_cmds |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
148 ); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
149 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
150 // Define table boundaries |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
151 CYG_HAL_TABLE_BEGIN( __FIS_cmds_TAB__, FIS_cmds); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
152 CYG_HAL_TABLE_END( __FIS_cmds_TAB_END__, FIS_cmds); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
153 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
154 extern struct cmd __FIS_cmds_TAB__[], __FIS_cmds_TAB_END__; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
155 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
156 // CLI function |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
157 static cmd_fun do_fis; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
158 RedBoot_nested_cmd("fis", |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
159 "Manage FLASH images", |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
160 "{cmds}", |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
161 do_fis, |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
162 __FIS_cmds_TAB__, &__FIS_cmds_TAB_END__ |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
163 ); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
164 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
165 // Local data used by these routines |
| 1700 | 166 cyg_flashaddr_t flash_start, flash_end; |
| 167 size_t flash_block_size; | |
| 168 cyg_uint32 flash_num_blocks; | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
169 #ifdef CYGOPT_REDBOOT_FIS |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
170 void *fis_work_block; |
| 1700 | 171 cyg_flashaddr_t fis_addr; |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
172 int fisdir_size; // Size of FIS directory. |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
173 #endif |
|
172
cd45958b28ff
Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents:
171
diff
changeset
|
174 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG |
| 1700 | 175 extern cyg_flashaddr_t cfg_base; // Location in Flash of config data |
| 176 extern size_t cfg_size; // Length of config data - rounded to Flash block size | |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
177 extern struct _config *config; |
|
172
cd45958b28ff
Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents:
171
diff
changeset
|
178 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
179 |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
180 static void |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
181 fis_usage(char *why) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
182 { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
183 diag_printf("*** invalid 'fis' command: %s\n", why); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
184 cmd_usage(__FIS_cmds_TAB__, &__FIS_cmds_TAB_END__, "fis "); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
185 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
186 |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
187 static void |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
188 _show_invalid_flash_address(CYG_ADDRESS flash_addr, int stat) |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
189 { |
| 1700 | 190 cyg_uint32 i=0; |
| 191 cyg_flash_info_t info; | |
| 192 int ret; | |
| 193 | |
| 194 diag_printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, | |
| 195 cyg_flash_errmsg(stat)); | |
| 196 do { | |
| 197 ret = cyg_flash_get_info(i, &info); | |
| 198 if (ret == CYG_FLASH_ERR_OK) { | |
| 199 diag_printf(" valid range is %p - %p\n", info.start, info.end); | |
| 200 } | |
| 201 i++; | |
| 202 } while (ret != CYG_FLASH_ERR_INVALID); | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
203 } |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
204 |
| 1746 | 205 // Avoid overwriting the current executable. This is not a complete |
| 206 // implementation, there may be code outside the text region, but it | |
| 207 // is generally good enough. If either the start of the text region or | |
| 208 // the end of the text region is within the specified range then at | |
| 209 // least some of the code is in the area of flash about to be erased | |
| 210 // or programmed. | |
| 211 static cyg_bool | |
| 212 check_code_overlaps(cyg_flashaddr_t start, cyg_flashaddr_t end) | |
| 213 { | |
| 214 extern char _stext[], _etext[]; | |
| 215 | |
| 216 return ((((unsigned long)&_stext >= (unsigned long)start) && | |
| 217 ((unsigned long)&_stext < (unsigned long)end)) | |
| 218 || | |
| 219 (((unsigned long)&_etext >= (unsigned long)start) && | |
| 220 ((unsigned long)&_etext < (unsigned long)end))); | |
| 221 } | |
| 222 | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
223 #ifdef CYGOPT_REDBOOT_FIS |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
224 struct fis_image_desc * |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
225 fis_lookup(char *name, int *num) |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
226 { |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
227 int i; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
228 struct fis_image_desc *img; |
| 1700 | 229 cyg_flashaddr_t err_addr; |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
230 |
| 1700 | 231 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
232 img = (struct fis_image_desc *)fis_work_block; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
233 for (i = 0; i < fisdir_size/sizeof(*img); i++, img++) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
234 if ((img->name[0] != (unsigned char)0xFF) && |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
235 (strcasecmp(name, img->name) == 0)) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
236 if (num) *num = i; |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
237 return img; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
238 } |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
239 } |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
240 return (struct fis_image_desc *)0; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
241 } |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
242 |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
243 void |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
244 fis_update_directory(void) |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
245 { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
246 int stat; |
| 1700 | 247 cyg_flashaddr_t err_addr; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
248 |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
249 #ifdef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
250 memcpy((char *)fis_work_block+fisdir_size, config, cfg_size); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
251 #endif |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
252 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
253 // Ensure [quietly] that the directory is unlocked before trying to update |
|
1717
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
254 cyg_flash_unlock(fis_addr, flash_block_size, &err_addr); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
255 #endif |
| 1700 | 256 if ((stat = cyg_flash_erase(fis_addr, flash_block_size, &err_addr)) != 0) { |
| 257 diag_printf("Error erasing FIS directory at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
258 } else { |
| 1700 | 259 if ((stat = cyg_flash_program(fis_addr, fis_work_block, flash_block_size, |
| 260 &err_addr)) != 0) { | |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
261 diag_printf("Error writing FIS directory at %p: %s\n", |
| 1700 | 262 err_addr, cyg_flash_errmsg(stat)); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
263 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
264 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
265 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
266 // Ensure [quietly] that the directory is locked after the update |
|
1717
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
267 cyg_flash_lock(fis_addr, flash_block_size, &err_addr); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
268 #endif |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
269 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
270 |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
271 static void |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
272 fis_init(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
273 { |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
274 int stat; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
275 struct fis_image_desc *img; |
| 1700 | 276 cyg_flashaddr_t err_addr; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
277 bool full_init = false; |
|
117
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
278 struct option_info opts[1]; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
279 CYG_ADDRESS redboot_flash_start; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
280 unsigned long redboot_image_size; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
281 |
|
117
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
282 init_opts(&opts[0], 'f', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 283 (void *)&full_init, (bool *)0, "full initialization, erases all of flash"); |
|
117
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
284 if (!scan_opts(argc, argv, 2, opts, 1, 0, 0, "")) |
|
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
285 { |
|
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
286 return; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
287 } |
|
117
bd1a71e3e476
Merge from eCos master repository on 2000-08-25-19:22:58-BST
jlarmour
parents:
115
diff
changeset
|
288 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
289 if (!verify_action("About to initialize [format] FLASH image system")) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
290 diag_printf("** Aborted\n"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
291 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
292 } |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
293 diag_printf("*** Initialize FLASH Image System\n"); |
|
147
d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
jlarmour
parents:
145
diff
changeset
|
294 |
|
d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
jlarmour
parents:
145
diff
changeset
|
295 #define MIN_REDBOOT_IMAGE_SIZE CYGBLD_REDBOOT_MIN_IMAGE_SIZE |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
296 redboot_image_size = flash_block_size > MIN_REDBOOT_IMAGE_SIZE ? |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
297 flash_block_size : MIN_REDBOOT_IMAGE_SIZE; |
|
147
d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
jlarmour
parents:
145
diff
changeset
|
298 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
299 // Create a pseudo image for RedBoot |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
300 img = (struct fis_image_desc *)fis_work_block; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
301 memset(img, 0xFF, fisdir_size); // Start with erased data |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
302 #ifdef CYGOPT_REDBOOT_FIS_RESERVED_BASE |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
303 memset(img, 0, sizeof(*img)); |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
304 strcpy(img->name, "(reserved)"); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
305 img->flash_base = (CYG_ADDRESS)flash_start; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
306 img->mem_base = (CYG_ADDRESS)flash_start; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
307 img->size = CYGNUM_REDBOOT_FLASH_RESERVED_BASE; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
308 img++; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
309 #endif |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
310 redboot_flash_start = (CYG_ADDRESS)flash_start + CYGBLD_REDBOOT_FLASH_BOOT_OFFSET; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
311 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
312 memset(img, 0, sizeof(*img)); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
313 strcpy(img->name, "RedBoot"); |
|
147
d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
jlarmour
parents:
145
diff
changeset
|
314 img->flash_base = redboot_flash_start; |
|
d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
jlarmour
parents:
145
diff
changeset
|
315 img->mem_base = redboot_flash_start; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
316 img->size = redboot_image_size; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
317 img++; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
318 redboot_flash_start += redboot_image_size; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
319 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
320 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_POST |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
321 #ifdef CYGNUM_REDBOOT_FIS_REDBOOT_POST_OFFSET |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
322 // Take care to place the POST entry at the right offset: |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
323 redboot_flash_start = (CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FIS_REDBOOT_POST_OFFSET; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
324 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
325 memset(img, 0, sizeof(*img)); |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
326 strcpy(img->name, "RedBoot[post]"); |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
327 img->flash_base = redboot_flash_start; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
328 img->mem_base = redboot_flash_start; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
329 img->size = redboot_image_size; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
330 img++; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
331 redboot_flash_start += redboot_image_size; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
332 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
333 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
334 // And a backup image |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
335 memset(img, 0, sizeof(*img)); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
336 strcpy(img->name, "RedBoot[backup]"); |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
337 img->flash_base = redboot_flash_start; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
338 img->mem_base = redboot_flash_start; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
339 img->size = redboot_image_size; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
340 img++; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
341 redboot_flash_start += redboot_image_size; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
342 #endif |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
343 #if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH) |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
344 // And a descriptor for the configuration data |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
345 memset(img, 0, sizeof(*img)); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
346 strcpy(img->name, "RedBoot config"); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
347 img->flash_base = (CYG_ADDRESS)cfg_base; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
348 img->mem_base = (CYG_ADDRESS)cfg_base; |
|
172
cd45958b28ff
Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents:
171
diff
changeset
|
349 img->size = cfg_size; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
350 img++; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
351 #endif |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
352 // And a descriptor for the descriptor table itself |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
353 memset(img, 0, sizeof(*img)); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
354 strcpy(img->name, "FIS directory"); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
355 img->flash_base = (CYG_ADDRESS)fis_addr; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
356 img->mem_base = (CYG_ADDRESS)fis_addr; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
357 img->size = fisdir_size; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
358 img++; |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
359 |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
360 #ifdef CYGOPT_REDBOOT_FIS_DIRECTORY_ARM_SIB_ID |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
361 // FIS gets the size of a full block - note, this should be changed |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
362 // if support is added for multi-block FIS structures. |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
363 img = (struct fis_image_desc *)((CYG_ADDRESS)fis_work_block + fisdir_size); |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
364 // Add a footer so the FIS will be recognized by the ARM Boot |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
365 // Monitor as a reserved area. |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
366 { |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
367 tFooter* footer_p = (tFooter*)((CYG_ADDRESS)img - sizeof(tFooter)); |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
368 cyg_uint32 check = 0; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
369 cyg_uint32 *check_ptr = (cyg_uint32 *)footer_p; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
370 cyg_int32 count = (sizeof(tFooter) - 4) >> 2; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
371 |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
372 // Prepare footer. Try to protect all but the reserved space |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
373 // and the first RedBoot image (which is expected to be |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
374 // bootable), but fall back to just protecting the FIS if it's |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
375 // not at the default position in the flash. |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
376 #if defined(CYGOPT_REDBOOT_FIS_RESERVED_BASE) && (-1 == CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK) |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
377 footer_p->blockBase = (char*)_ADDR_REDBOOT_TO_ARM(flash_start); |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
378 footer_p->blockBase += CYGNUM_REDBOOT_FLASH_RESERVED_BASE + redboot_image_size; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
379 #else |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
380 footer_p->blockBase = (char*)_ADDR_REDBOOT_TO_ARM(fis_work_block); |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
381 #endif |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
382 footer_p->infoBase = NULL; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
383 footer_p->signature = FLASH_FOOTER_SIGNATURE; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
384 footer_p->type = TYPE_REDHAT_REDBOOT; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
385 |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
386 // and compute its checksum |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
387 for ( ; count > 0; count--) { |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
388 if (*check_ptr > ~check) |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
389 check++; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
390 check += *check_ptr++; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
391 } |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
392 footer_p->checksum = ~check; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
393 } |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
394 #endif |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
395 |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
396 // Do this after creating the initialized table because that inherently |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
397 // calculates where the high water mark of default RedBoot images is. |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
398 |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
399 if (full_init) { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
400 unsigned long erase_size; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
401 CYG_ADDRESS erase_start; |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
402 // Erase everything except default RedBoot images, fis block, |
|
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
403 // and config block. |
|
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
404 // First deal with the possible first part, before RedBoot images: |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
405 #if (CYGBLD_REDBOOT_FLASH_BOOT_OFFSET > CYGNUM_REDBOOT_FLASH_RESERVED_BASE) |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
406 erase_start = (CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
407 erase_size = (CYG_ADDRESS)flash_start + CYGBLD_REDBOOT_FLASH_BOOT_OFFSET; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
408 if ( erase_size > erase_start ) { |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
409 erase_size -= erase_start; |
| 1700 | 410 if ((stat = cyg_flash_erase((void *)erase_start, erase_size, |
| 411 &err_addr)) != 0) { | |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
412 diag_printf(" initialization failed at %p: %s\n", |
| 1700 | 413 err_addr, cyg_flash_errmsg(stat)); |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
414 } |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
415 } |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
416 #endif |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
417 // second deal with the larger part in the main: |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
418 erase_start = redboot_flash_start; // high water of created images |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
419 // Now the empty bits between the end of Redboot and the cfg and dir |
|
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
420 // blocks. |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
421 #if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && \ |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
422 defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH) && \ |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
423 !defined(CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG) |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
424 if (fis_addr > cfg_base) { |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
425 erase_size = (CYG_ADDRESS)cfg_base - erase_start; // the gap between HWM and config data |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
426 } else { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
427 erase_size = (CYG_ADDRESS)fis_addr - erase_start; // the gap between HWM and fis data |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
428 } |
| 1700 | 429 if ((stat = cyg_flash_erase(erase_start, erase_size,&err_addr)) != 0) { |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
430 diag_printf(" initialization failed %p: %s\n", |
| 1700 | 431 err_addr, cyg_flash_errmsg(stat)); |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
432 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
433 erase_start += (erase_size + flash_block_size); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
434 if (fis_addr > cfg_base) { |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
435 erase_size = (CYG_ADDRESS)fis_addr - erase_start; // the gap between config and fis data |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
436 } else { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
437 erase_size = (CYG_ADDRESS)cfg_base - erase_start; // the gap between fis and config data |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
438 } |
| 1700 | 439 if ((stat = cyg_flash_erase(erase_start, erase_size,&err_addr)) != 0) { |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
440 diag_printf(" initialization failed %p: %s\n", |
| 1700 | 441 err_addr, cyg_flash_errmsg(stat)); |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
442 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
443 erase_start += (erase_size + flash_block_size); |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
444 #else // !CYGSEM_REDBOOT_FLASH_CONFIG |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
445 erase_size = (CYG_ADDRESS)fis_addr - erase_start; // the gap between HWM and fis data |
| 1700 | 446 if ((stat = cyg_flash_erase(erase_start, erase_size,&err_addr)) != 0) { |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
447 diag_printf(" initialization failed %p: %s\n", |
| 1700 | 448 err_addr, cyg_flash_errmsg(stat)); |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
449 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
450 erase_start += (erase_size + flash_block_size); |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
451 #endif |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
452 // Lastly, anything at the end |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
453 erase_size = ((CYG_ADDRESS)flash_end - erase_start) + 1; |
| 1700 | 454 if ((stat = cyg_flash_erase(erase_start, erase_size, |
| 455 &err_addr)) != 0) { | |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
456 diag_printf(" initialization failed at %p: %s\n", |
| 1700 | 457 err_addr, cyg_flash_errmsg(stat)); |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
458 } |
| 1354 | 459 #ifndef CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
| 460 // In this case, 'fis free' works by scanning for erased blocks. Since the | |
| 461 // "-f" option was not supplied, there may be areas which are not used but | |
| 462 // don't appear to be free since they are not erased - thus the warning | |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
463 } else { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
464 diag_printf(" Warning: device contents not erased, some blocks may not be usable\n"); |
| 1354 | 465 #endif |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
466 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
467 fis_update_directory(); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
468 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
469 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
470 static void |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
471 fis_list(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
472 { |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
473 struct fis_image_desc *img; |
| 1278 | 474 int i, image_indx; |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
475 bool show_cksums = false; |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
476 bool show_datalen = false; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
477 struct option_info opts[2]; |
| 1700 | 478 cyg_flashaddr_t err_addr; |
| 1278 | 479 unsigned long last_addr, lowest_addr; |
| 480 bool image_found; | |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
481 |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
482 #ifdef CYGHWR_REDBOOT_ARM_FLASH_SIB |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
483 // FIXME: this is somewhat half-baked |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
484 extern void arm_fis_list(void); |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
485 arm_fis_list(); |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
486 return; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
487 #endif |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
488 |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
489 init_opts(&opts[0], 'd', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 490 (void *)&show_datalen, (bool *)0, "display data length"); |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
491 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
492 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 493 (void *)&show_cksums, (bool *)0, "display checksums"); |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
494 i = 2; |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
495 #else |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
496 i = 1; |
|
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
497 #endif |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
498 if (!scan_opts(argc, argv, 2, opts, i, 0, 0, "")) { |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
499 return; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
500 } |
| 1700 | 501 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
502 // Let diag_printf do the formatting in both cases, rather than counting |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
503 // cols by hand.... |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
504 diag_printf("%-16s %-10s %-10s %-10s %-s\n", |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
505 "Name","FLASH addr", |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
506 show_cksums ? "Checksum" : "Mem addr", |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
507 show_datalen ? "Datalen" : "Length", |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
508 "Entry point" ); |
| 1278 | 509 last_addr = 0; |
| 510 image_indx = 0; | |
| 511 do { | |
| 512 image_found = false; | |
| 513 lowest_addr = 0xFFFFFFFF; | |
| 514 img = (struct fis_image_desc *) fis_work_block; | |
| 515 for (i = 0; i < fisdir_size/sizeof(*img); i++, img++) { | |
| 516 if (img->name[0] != (unsigned char)0xFF) { | |
| 517 if ((img->flash_base > last_addr) && (img->flash_base < lowest_addr)) { | |
| 518 lowest_addr = img->flash_base; | |
| 519 image_found = true; | |
| 520 image_indx = i; | |
| 521 } | |
| 522 } | |
| 523 } | |
| 524 if (image_found) { | |
| 525 img = (struct fis_image_desc *) fis_work_block; | |
| 526 img += image_indx; | |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
527 diag_printf("%-16s 0x%08lX 0x%08lX 0x%08lX 0x%08lX\n", img->name, |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
528 img->flash_base, |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
529 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
530 show_cksums ? img->file_cksum : img->mem_base, |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
531 show_datalen ? img->data_length : img->size, |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
532 #else |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
533 img->mem_base, |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
534 img->size, |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
535 #endif |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
536 img->entry_point); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
537 } |
| 1278 | 538 last_addr = lowest_addr; |
| 539 } while (image_found == true); | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
540 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
541 |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
542 #ifdef CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
543 struct free_chunk { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
544 CYG_ADDRESS start, end; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
545 }; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
546 |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
547 static int |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
548 find_free(struct free_chunk *chunks) |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
549 { |
| 1700 | 550 cyg_flashaddr_t err_addr; |
| 551 cyg_flash_info_t info; | |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
552 struct fis_image_desc *img; |
| 1700 | 553 int i=0, idx; |
| 554 int num_chunks = 0; | |
| 555 int ret; | |
| 556 | |
| 557 do { | |
| 558 ret = cyg_flash_get_info(i, &info); | |
| 559 if (ret == CYG_FLASH_ERR_OK) { | |
| 560 if (i == 0 ) { | |
| 561 // Do not search the area reserved for pre-RedBoot systems: | |
| 562 chunks[num_chunks].start = (info.start + | |
| 563 CYGNUM_REDBOOT_FLASH_RESERVED_BASE + | |
| 564 CYGBLD_REDBOOT_MIN_IMAGE_SIZE); | |
| 565 chunks[num_chunks].end = info.end; | |
| 566 num_chunks++; | |
| 567 } else { // Contiguous flash? If so collapse the chunks together. | |
| 568 if (chunks[num_chunks-1].end == (info.start -1)) { | |
| 569 chunks[num_chunks-1].end = info.end; | |
| 570 } else { | |
| 571 chunks[num_chunks].start = info.start; | |
| 572 chunks[num_chunks].end = info.end; | |
| 573 num_chunks++; | |
| 574 } | |
| 575 } | |
| 576 } | |
| 577 i++; | |
| 578 } while (ret != CYG_FLASH_ERR_INVALID); | |
| 579 | |
| 580 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); | |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
581 img = (struct fis_image_desc *) fis_work_block; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
582 for (i = 0; i < fisdir_size/sizeof(*img); i++, img++) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
583 if (img->name[0] != (unsigned char)0xFF) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
584 // Figure out which chunk this is in and split it |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
585 for (idx = 0; idx < num_chunks; idx++) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
586 if ((img->flash_base >= chunks[idx].start) && |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
587 (img->flash_base <= chunks[idx].end)) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
588 if (img->flash_base == chunks[idx].start) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
589 chunks[idx].start += img->size; |
| 1349 | 590 if (chunks[idx].start >= chunks[idx].end) { |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
591 // This free chunk has collapsed |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
592 while (idx < (num_chunks-1)) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
593 chunks[idx] = chunks[idx+1]; |
|
1679
b548ac5af76c
* src/flash.c (find_free): fix endless loop when removing a
asl
parents:
1627
diff
changeset
|
594 idx++; |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
595 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
596 num_chunks--; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
597 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
598 } else if ((img->flash_base+img->size) == chunks[idx].end) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
599 chunks[idx].end = img->flash_base; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
600 } else { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
601 // Split chunk into two parts |
| 1700 | 602 chunks[idx+1].start = img->flash_base + img->size; |
| 603 chunks[idx+1].end = chunks[idx].end; | |
| 604 if (++num_chunks == CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS) { | |
| 605 diag_printf("Warning: too many free chunks\n"); | |
| 606 return num_chunks; | |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
607 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
608 chunks[idx].end = img->flash_base; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
609 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
610 break; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
611 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
612 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
613 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
614 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
615 return num_chunks; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
616 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
617 #endif // CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
618 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
619 static void |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
620 fis_free(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
621 { |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
622 #ifndef CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
| 1251 | 623 unsigned long *fis_ptr, *fis_end, flash_data; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
624 unsigned long *area_start; |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
625 void *err_addr; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
626 |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
627 // Do not search the area reserved for pre-RedBoot systems: |
| 1251 | 628 fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + |
| 1136 | 629 CYGNUM_REDBOOT_FLASH_RESERVED_BASE + |
| 630 CYGBLD_REDBOOT_MIN_IMAGE_SIZE); | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
631 fis_end = (unsigned long *)(CYG_ADDRESS)flash_end; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
632 area_start = fis_ptr; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
633 while (fis_ptr < fis_end) { |
| 1251 | 634 flash_read(fis_ptr, &flash_data, sizeof(unsigned long), (void **)&err_addr); |
| 635 if (flash_data != (unsigned long)0xFFFFFFFF) { | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
636 if (area_start != fis_ptr) { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
637 // Assume that this is something |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
638 diag_printf(" 0x%08lX .. 0x%08lX\n", |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
639 (CYG_ADDRESS)area_start, (CYG_ADDRESS)fis_ptr); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
640 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
641 // Find next blank block |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
642 area_start = fis_ptr; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
643 while (area_start < fis_end) { |
| 1251 | 644 flash_read(area_start, &flash_data, sizeof(unsigned long), (void **)&err_addr); |
| 645 if (flash_data == (unsigned long)0xFFFFFFFF) { | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
646 break; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
647 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
648 area_start += flash_block_size / sizeof(CYG_ADDRESS); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
649 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
650 fis_ptr = area_start; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
651 } else { |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
652 fis_ptr += flash_block_size / sizeof(CYG_ADDRESS); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
653 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
654 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
655 if (area_start != fis_ptr) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
656 diag_printf(" 0x%08lX .. 0x%08lX\n", |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
657 (CYG_ADDRESS)area_start, (CYG_ADDRESS)fis_ptr); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
658 } |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
659 #else |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
660 struct free_chunk chunks[CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS]; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
661 int idx, num_chunks; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
662 |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
663 num_chunks = find_free(chunks); |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
664 for (idx = 0; idx < num_chunks; idx++) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
665 diag_printf(" 0x%08lX .. 0x%08lX\n", chunks[idx].start, chunks[idx].end); |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
666 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
667 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
668 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
669 |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
670 // Find the first unused area of flash which is long enough |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
671 static bool |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
672 fis_find_free(CYG_ADDRESS *addr, unsigned long length) |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
673 { |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
674 #ifndef CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
| 1251 | 675 unsigned long *fis_ptr, *fis_end, flash_data; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
676 unsigned long *area_start; |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
677 void *err_addr; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
678 |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
679 // Do not search the area reserved for pre-RedBoot systems: |
| 1251 | 680 fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + |
| 1136 | 681 CYGNUM_REDBOOT_FLASH_RESERVED_BASE + |
| 682 CYGBLD_REDBOOT_MIN_IMAGE_SIZE); | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
683 fis_end = (unsigned long *)(CYG_ADDRESS)flash_end; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
684 area_start = fis_ptr; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
685 while (fis_ptr < fis_end) { |
| 1251 | 686 flash_read(fis_ptr, &flash_data, sizeof(unsigned long), (void **)&err_addr); |
| 687 if (flash_data != (unsigned long)0xFFFFFFFF) { | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
688 if (area_start != fis_ptr) { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
689 // Assume that this is something |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
690 if ((fis_ptr-area_start) >= (length/sizeof(unsigned))) { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
691 *addr = (CYG_ADDRESS)area_start; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
692 return true; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
693 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
694 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
695 // Find next blank block |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
696 area_start = fis_ptr; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
697 while (area_start < fis_end) { |
| 1251 | 698 flash_read(area_start, &flash_data, sizeof(unsigned long), (void **)&err_addr); |
| 699 if (flash_data == (unsigned long)0xFFFFFFFF) { | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
700 break; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
701 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
702 area_start += flash_block_size / sizeof(CYG_ADDRESS); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
703 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
704 fis_ptr = area_start; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
705 } else { |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
706 fis_ptr += flash_block_size / sizeof(CYG_ADDRESS); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
707 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
708 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
709 if (area_start != fis_ptr) { |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
710 if ((fis_ptr-area_start) >= (length/sizeof(unsigned))) { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
711 *addr = (CYG_ADDRESS)area_start; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
712 return true; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
713 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
714 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
715 return false; |
|
1297
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
716 #else |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
717 struct free_chunk chunks[CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS]; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
718 int idx, num_chunks; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
719 |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
720 num_chunks = find_free(chunks); |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
721 for (idx = 0; idx < num_chunks; idx++) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
722 if ((chunks[idx].end - chunks[idx].start) >= length) { |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
723 *addr = (CYG_ADDRESS)chunks[idx].start; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
724 return true; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
725 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
726 } |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
727 return false; |
|
4212c82ebff6
Make 'fis free' use the FIS directory to determine what's free
gthomas
parents:
1295
diff
changeset
|
728 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
729 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
730 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
731 static void |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
732 fis_create(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
733 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
734 int i, stat; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
735 unsigned long length, img_size; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
736 CYG_ADDRESS mem_addr, exec_addr, flash_addr, entry_addr; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
737 char *name; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
738 bool mem_addr_set = false; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
739 bool exec_addr_set = false; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
740 bool entry_addr_set = false; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
741 bool flash_addr_set = false; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
742 bool length_set = false; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
743 bool img_size_set = false; |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
744 bool no_copy = false; |
| 1700 | 745 cyg_flashaddr_t err_addr; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
746 struct fis_image_desc *img = NULL; |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
747 bool defaults_assumed; |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
748 struct option_info opts[7]; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
749 bool prog_ok = true; |
| 1700 | 750 size_t block_size; |
| 751 | |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
752 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 753 (void *)&mem_addr, (bool *)&mem_addr_set, "memory base address"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
754 init_opts(&opts[1], 'r', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 755 (void *)&exec_addr, (bool *)&exec_addr_set, "ram base address"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
756 init_opts(&opts[2], 'e', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 757 (void *)&entry_addr, (bool *)&entry_addr_set, "entry point address"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
758 init_opts(&opts[3], 'f', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 759 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
760 init_opts(&opts[4], 'l', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 761 (void *)&length, (bool *)&length_set, "image length [in FLASH]"); |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
762 init_opts(&opts[5], 's', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 763 (void *)&img_size, (bool *)&img_size_set, "image size [actual data]"); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
764 init_opts(&opts[6], 'n', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 765 (void *)&no_copy, (bool *)0, "don't copy from RAM to FLASH, just update directory"); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
766 if (!scan_opts(argc, argv, 2, opts, 7, (void *)&name, OPTION_ARG_TYPE_STR, "file name")) |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
767 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
768 fis_usage("invalid arguments"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
769 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
770 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
771 |
| 1700 | 772 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
773 defaults_assumed = false; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
774 if (name) { |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
775 // Search existing files to acquire defaults for params not specified: |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
776 img = fis_lookup(name, NULL); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
777 if (img) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
778 // Found it, so get image size from there |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
779 if (!length_set) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
780 length_set = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
781 length = img->size; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
782 defaults_assumed = true; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
783 } |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
784 } |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
785 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
786 if (!mem_addr_set && (load_address >= (CYG_ADDRESS)ram_start) && |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
787 (load_address_end) < (CYG_ADDRESS)ram_end) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
788 mem_addr = load_address; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
789 mem_addr_set = true; |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
790 defaults_assumed = true; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
791 // Get entry address from loader, unless overridden |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
792 if (!entry_addr_set) |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
793 entry_addr = entry_address; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
794 if (!length_set) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
795 length = load_address_end - load_address; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
796 length_set = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
797 } else if (defaults_assumed && !img_size_set) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
798 /* We got length from the FIS table, so the size of the |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
799 actual loaded image becomes img_size */ |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
800 img_size = load_address_end - load_address; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
801 img_size_set = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
802 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
803 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
804 // Get the remaining fall-back values from the fis |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
805 if (img) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
806 if (!exec_addr_set) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
807 // Preserve "normal" behaviour |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
808 exec_addr_set = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
809 exec_addr = flash_addr_set ? flash_addr : mem_addr; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
810 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
811 if (!flash_addr_set) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
812 flash_addr_set = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
813 flash_addr = img->flash_base; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
814 defaults_assumed = true; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
815 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
816 } |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
817 |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
818 if ((!no_copy && !mem_addr_set) || (no_copy && !flash_addr_set) || |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
819 !length_set || !name) { |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
820 fis_usage("required parameter missing"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
821 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
822 } |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
823 if (!img_size_set) { |
|
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
824 img_size = length; |
|
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
825 } |
|
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
826 // 'length' is size of FLASH image, 'img_size' is actual data size |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
827 if (strlen(name) >= sizeof(img->name)) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
828 diag_printf("Name is too long, must be less than %d chars\n", (int)sizeof(img->name)); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
829 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
830 } |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
831 if (!no_copy) { |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
832 if ((mem_addr < (CYG_ADDRESS)ram_start) || |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
833 ((mem_addr+img_size) >= (CYG_ADDRESS)ram_end)) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
834 diag_printf("** WARNING: RAM address: %p may be invalid\n", (void *)mem_addr); |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
835 diag_printf(" valid range is %p-%p\n", (void *)ram_start, (void *)ram_end); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
836 } |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
837 if (!flash_addr_set && !fis_find_free(&flash_addr, length)) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
838 diag_printf("Can't locate %lx(%ld) bytes free in FLASH\n", length, length); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
839 return; |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
840 } |
| 1700 | 841 flash_addr_set = true; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
842 } |
| 1700 | 843 if (flash_addr_set) { |
| 844 block_size = cyg_flash_block_size(flash_addr + length); | |
| 845 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken | |
| 846 length = ((length + block_size - 1) / block_size) * block_size; | |
| 847 if (length < img_size) { | |
| 848 diag_printf("Invalid FLASH image size/length combination\n"); | |
| 849 return; | |
| 850 } | |
| 851 #endif | |
| 852 if ((stat = cyg_flash_verify_addr(flash_addr)) || | |
| 853 (stat = cyg_flash_verify_addr((flash_addr+length-1)))) { | |
| 854 _show_invalid_flash_address(flash_addr, stat); | |
| 855 return; | |
| 856 } | |
| 857 block_size = cyg_flash_block_size(flash_addr); | |
| 858 if ((flash_addr & (flash_block_size-1)) != 0) { | |
| 859 diag_printf("Invalid FLASH address: %p\n", (void *)flash_addr); | |
| 860 diag_printf(" must be 0x%x aligned\n", flash_block_size); | |
| 861 return; | |
| 862 } | |
| 863 } | |
| 864 | |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
865 // First, see if the image by this name has agreable properties |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
866 if (img) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
867 if (flash_addr_set && (img->flash_base != flash_addr)) { |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
868 diag_printf("Image found, but flash address (%p)\n" |
|
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
869 " is incorrect (present image location %p)\n", |
|
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
870 flash_addr, img->flash_base); |
|
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
871 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
872 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
873 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
874 if (img->size != length) { |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
875 diag_printf("Image found, but length (0x%lx, necessitating image size 0x%lx)\n" |
|
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
876 " is incorrect (present image size 0x%lx)\n", |
|
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
877 img_size, length, img->size); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
878 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
879 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
880 if (!verify_action("An image named '%s' exists", name)) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
881 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
882 } else { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
883 if (defaults_assumed) { |
| 310 | 884 if (no_copy && |
| 885 !verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p", | |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
886 name, (void *)flash_addr, (void *)(flash_addr+img_size-1), |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
887 (void *)mem_addr)) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
888 return; // The guy gave up |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
889 } |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
890 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
891 } |
|
210
d2c90368aeef
Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents:
208
diff
changeset
|
892 } else { |
| 1301 | 893 #ifdef CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS |
| 894 // Make sure that any FLASH address specified directly is truly free | |
| 895 if (flash_addr_set && !no_copy) { | |
| 896 struct free_chunk chunks[CYGDAT_REDBOOT_FIS_MAX_FREE_CHUNKS]; | |
| 897 int idx, num_chunks; | |
| 898 bool is_free = false; | |
| 899 | |
| 900 num_chunks = find_free(chunks); | |
| 901 for (idx = 0; idx < num_chunks; idx++) { | |
| 902 if ((flash_addr >= chunks[idx].start) && | |
| 903 ((flash_addr+length-1) <= chunks[idx].end)) { | |
| 904 is_free = true; | |
| 905 } | |
| 906 } | |
| 907 if (!is_free) { | |
| 908 diag_printf("Invalid FLASH address - not free!\n"); | |
| 909 return; | |
| 910 } | |
| 911 } | |
| 912 #endif | |
| 1700 | 913 // If no image by that name, try and find an empty slot |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
914 img = (struct fis_image_desc *)fis_work_block; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
915 for (i = 0; i < fisdir_size/sizeof(*img); i++, img++) { |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
916 if (img->name[0] == (unsigned char)0xFF) { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
917 break; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
918 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
919 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
920 } |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
921 if (!no_copy) { |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
922 // Safety check - make sure the address range is not within the code we're running |
| 1746 | 923 if (check_code_overlaps(flash_addr, (flash_addr+img_size-1))) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
924 diag_printf("Can't program this region - contains code in use!\n"); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
925 return; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
926 } |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
927 if (prog_ok) { |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
928 // Erase area to be programmed |
| 1700 | 929 if ((stat = cyg_flash_erase(flash_addr, length, &err_addr)) != 0) { |
| 930 diag_printf("Can't erase region at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
931 prog_ok = false; |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
932 } |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
933 } |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
934 if (prog_ok) { |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
935 // Now program it |
| 1700 | 936 if ((stat = cyg_flash_program(flash_addr, (void *)mem_addr, img_size, |
| 937 &err_addr)) != 0) { | |
| 938 diag_printf("Can't program region at %p: %s\n", err_addr, | |
| 939 cyg_flash_errmsg(stat)); | |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
940 prog_ok = false; |
|
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
941 } |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
942 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
943 } |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
944 if (prog_ok) { |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
945 // Update directory |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
946 memset(img, 0, sizeof(*img)); |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
947 strcpy(img->name, name); |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
948 img->flash_base = flash_addr; |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
949 img->mem_base = exec_addr_set ? exec_addr : (flash_addr_set ? flash_addr : mem_addr); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
950 img->entry_point = entry_addr_set ? entry_addr : (CYG_ADDRESS)entry_address; // Hope it's been set |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
951 img->size = length; |
|
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
952 img->data_length = img_size; |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
953 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
954 if (!no_copy) { |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
955 img->file_cksum = cyg_crc32((unsigned char *)mem_addr, img_size); |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
956 } else { |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
957 // No way to compute this, sorry |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
958 img->file_cksum = 0; |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
959 } |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
960 #endif |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
961 fis_update_directory(); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
962 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
963 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
964 |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
965 extern void arm_fis_delete(char *); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
966 static void |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
967 fis_delete(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
968 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
969 char *name; |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
970 int num_reserved, i, stat; |
| 1700 | 971 cyg_flashaddr_t err_addr; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
972 struct fis_image_desc *img; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
973 |
| 1513 | 974 if (!scan_opts(argc, argv, 2, 0, 0, (void *)&name, OPTION_ARG_TYPE_STR, "image name")) |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
975 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
976 fis_usage("invalid arguments"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
977 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
978 } |
|
195
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
979 #ifdef CYGHWR_REDBOOT_ARM_FLASH_SIB |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
980 // FIXME: this is somewhat half-baked |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
981 arm_fis_delete(name); |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
982 return; |
|
67850532eebb
Merge from eCos master repository on 2001-11-02-06:43:03-GMT
jlarmour
parents:
191
diff
changeset
|
983 #endif |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
984 img = (struct fis_image_desc *)fis_work_block; |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
985 num_reserved = 0; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
986 #ifdef CYGOPT_REDBOOT_FIS_RESERVED_BASE |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
987 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
988 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
989 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
990 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
991 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
992 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
993 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
994 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
995 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_POST |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
996 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
997 #endif |
| 1268 | 998 #if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH) |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
999 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
1000 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
1001 #if 1 // And the descriptor for the descriptor table itself |
|
183
9160a8005d76
Merge from eCos master repository on 2001-09-12-03:52:30-BST
jlarmour
parents:
182
diff
changeset
|
1002 num_reserved++; |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
1003 #endif |
|
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
1004 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1005 img = fis_lookup(name, &i); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1006 if (img) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1007 if (i < num_reserved) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1008 diag_printf("Sorry, '%s' is a reserved image and cannot be deleted\n", img->name); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1009 return; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1010 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1011 if (!verify_action("Delete image '%s'", name)) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1012 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1013 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1014 } else { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1015 diag_printf("No image '%s' found\n", name); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1016 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1017 } |
|
119
77cec8369160
Merge from eCos master repository on 2000-09-01-07:47:03-BST
jlarmour
parents:
117
diff
changeset
|
1018 // Erase Data blocks (free space) |
| 1700 | 1019 if ((stat = cyg_flash_erase(img->flash_base, img->size, &err_addr)) != 0) { |
| 1020 diag_printf("Error erasing at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
1021 } else { |
| 280 | 1022 img->name[0] = (unsigned char)0xFF; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1023 fis_update_directory(); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1024 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1025 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1026 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1027 static void |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1028 fis_load(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1029 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1030 char *name; |
|
130
eb9fd8c04db3
Merge from eCos master repository on 2000-10-23-17:01:37-BST
jlarmour
parents:
126
diff
changeset
|
1031 struct fis_image_desc *img; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1032 CYG_ADDRESS mem_addr; |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1033 bool mem_addr_set = false; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1034 bool show_cksum = false; |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1035 struct option_info opts[3]; |
| 1627 | 1036 #if defined(CYGSEM_REDBOOT_FIS_CRC_CHECK) |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
1037 unsigned long cksum; |
|
159
511f4dc167f6
Merge from eCos master repository on 2001-05-18-01:30:05-BST
jlarmour
parents:
157
diff
changeset
|
1038 #endif |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1039 int num_options; |
| 1627 | 1040 #if defined(CYGPRI_REDBOOT_ZLIB_FLASH) || defined(CYGSEM_REDBOOT_FIS_CRC_CHECK) |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1041 bool decompress = false; |
|
160
0d0f03f76f6a
Merge from eCos master repository on 2001-06-01-18:52:13-BST
jlarmour
parents:
159
diff
changeset
|
1042 #endif |
| 1700 | 1043 cyg_flashaddr_t err_addr; |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1044 |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1045 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1046 (void *)&mem_addr, (bool *)&mem_addr_set, "memory [load] base address"); |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1047 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 1048 (void *)&show_cksum, (bool *)0, "display checksum"); |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1049 num_options = 2; |
|
1492
8b3549abe4ac
* cdl/redboot.cdl: Bring CYGNUM_REDBOOT_LOAD_ZLIB_BUFFER under
jlarmour
parents:
1393
diff
changeset
|
1050 #ifdef CYGPRI_REDBOOT_ZLIB_FLASH |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
1051 init_opts(&opts[num_options], 'd', false, OPTION_ARG_TYPE_FLG, |
| 1513 | 1052 (void *)&decompress, 0, "decompress"); |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1053 num_options++; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1054 #endif |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1055 |
|
1605
43a89c18d005
Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems.
gthomas
parents:
1513
diff
changeset
|
1056 CYG_ASSERT(num_options <= NUM_ELEMS(opts), "Too many options"); |
|
43a89c18d005
Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems.
gthomas
parents:
1513
diff
changeset
|
1057 |
| 1513 | 1058 if (!scan_opts(argc, argv, 2, opts, num_options, (void *)&name, OPTION_ARG_TYPE_STR, "image name")) |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1059 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1060 fis_usage("invalid arguments"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1061 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1062 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1063 if ((img = fis_lookup(name, NULL)) == (struct fis_image_desc *)0) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1064 diag_printf("No image '%s' found\n", name); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1065 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1066 } |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1067 if (!mem_addr_set) { |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1068 mem_addr = img->mem_base; |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1069 } |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1070 // Load image from FLASH into RAM |
|
962
0138b3d6b8a0
* src/flash.c: Only perform RAM check in fis load command when
jlarmour
parents:
849
diff
changeset
|
1071 #ifdef CYGSEM_REDBOOT_VALIDATE_USER_RAM_LOADS |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
1072 if (!valid_address((void *)mem_addr)) { |
|
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
1073 diag_printf("Not a loadable image - try using -b ADDRESS option\n"); |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1074 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1075 } |
|
962
0138b3d6b8a0
* src/flash.c: Only perform RAM check in fis load command when
jlarmour
parents:
849
diff
changeset
|
1076 #endif |
|
1492
8b3549abe4ac
* cdl/redboot.cdl: Bring CYGNUM_REDBOOT_LOAD_ZLIB_BUFFER under
jlarmour
parents:
1393
diff
changeset
|
1077 #ifdef CYGPRI_REDBOOT_ZLIB_FLASH |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1078 if (decompress) { |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1079 int err; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1080 _pipe_t fis_load_pipe; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1081 _pipe_t* p = &fis_load_pipe; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1082 p->out_buf = (unsigned char*) mem_addr; |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1083 p->out_max = p->out_size = -1; |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1084 p->in_buf = (unsigned char*) img->flash_base; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1085 p->in_avail = img->data_length; |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1086 |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1087 err = (*_dc_init)(p); |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1088 |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1089 if (0 == err) |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1090 err = (*_dc_inflate)(p); |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1091 |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1092 // Free used resources, do final translation of |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1093 // error value. |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1094 err = (*_dc_close)(p, err); |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1095 |
|
161
ac086aa3217e
Merge from eCos master repository on 2001-06-08-21:11:51-BST
jlarmour
parents:
160
diff
changeset
|
1096 if (0 != err && p->msg) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1097 diag_printf("decompression error: %s\n", p->msg); |
|
161
ac086aa3217e
Merge from eCos master repository on 2001-06-08-21:11:51-BST
jlarmour
parents:
160
diff
changeset
|
1098 } else { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1099 diag_printf("Image loaded from %p-%p\n", (unsigned char *)mem_addr, p->out_buf); |
|
161
ac086aa3217e
Merge from eCos master repository on 2001-06-08-21:11:51-BST
jlarmour
parents:
160
diff
changeset
|
1100 } |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1101 |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1102 // Set load address/top |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1103 load_address = mem_addr; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1104 load_address_end = (unsigned long)p->out_buf; |
|
307
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1105 |
|
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1106 // Reload fis directory |
| 1700 | 1107 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1108 } else // dangling block |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1109 #endif |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1110 { |
| 1700 | 1111 cyg_flash_read(img->flash_base, (void *)mem_addr, img->data_length, |
| 1112 &err_addr); | |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1113 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1114 // Set load address/top |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1115 load_address = mem_addr; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1116 load_address_end = mem_addr + img->data_length; |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1117 } |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1118 entry_address = (unsigned long)img->entry_point; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
195
diff
changeset
|
1119 |
| 1627 | 1120 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK |
| 284 | 1121 cksum = cyg_crc32((unsigned char *)mem_addr, img->data_length); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
1122 if (show_cksum) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1123 diag_printf("Checksum: 0x%08lx\n", cksum); |
|
143
6b5f480c6929
Merge from eCos master repository on 2000-12-08-02:09:36-GMT
jlarmour
parents:
138
diff
changeset
|
1124 } |
|
156
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1125 // When decompressing, leave CRC checking to decompressor |
|
b939e9cada46
Merge from eCos master repository on 2001-03-29-21:44:39-BST
jlarmour
parents:
154
diff
changeset
|
1126 if (!decompress && img->file_cksum) { |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1127 if (cksum != img->file_cksum) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1128 diag_printf("** Warning - checksum failure. stored: 0x%08lx, computed: 0x%08lx\n", |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1129 img->file_cksum, cksum); |
|
1679
b548ac5af76c
* src/flash.c (find_free): fix endless loop when removing a
asl
parents:
1627
diff
changeset
|
1130 entry_address = (unsigned long)NO_MEMORY; |
|
132
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1131 } |
|
0ae0bc38e387
Merge from eCos master repository on 2000-10-31-00:30:36-GMT
jlarmour
parents:
130
diff
changeset
|
1132 } |
|
157
b65ec671dd4c
Merge from eCos master repository on 2001-04-06-18:28:36-BST
jlarmour
parents:
156
diff
changeset
|
1133 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1134 } |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1135 #endif // CYGOPT_REDBOOT_FIS |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1136 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1137 static void |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1138 fis_write(int argc, char *argv[]) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1139 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1140 int stat; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1141 unsigned long length; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1142 CYG_ADDRESS mem_addr, flash_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1143 bool mem_addr_set = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1144 bool flash_addr_set = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1145 bool length_set = false; |
| 1700 | 1146 cyg_flashaddr_t err_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1147 struct option_info opts[3]; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1148 bool prog_ok; |
| 1700 | 1149 size_t block_size; |
| 1150 | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1151 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1152 (void *)&mem_addr, (bool *)&mem_addr_set, "memory base address"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1153 init_opts(&opts[1], 'f', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1154 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1155 init_opts(&opts[2], 'l', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1156 (void *)&length, (bool *)&length_set, "image length [in FLASH]"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1157 if (!scan_opts(argc, argv, 2, opts, 3, 0, 0, 0)) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1158 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1159 fis_usage("invalid arguments"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1160 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1161 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1162 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1163 if (!mem_addr_set || !flash_addr_set || !length_set) { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1164 fis_usage("required parameter missing"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1165 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1166 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1167 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1168 // Round up length to FLASH block size |
| 1700 | 1169 block_size = cyg_flash_block_size(flash_addr + length); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1170 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken |
| 1700 | 1171 length = ((length + block_size - 1) / block_size) * block_size; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1172 #endif |
| 1700 | 1173 if ((stat = cyg_flash_verify_addr(flash_addr)) || |
| 1174 (stat = cyg_flash_verify_addr((flash_addr+length-1)))) { | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1175 _show_invalid_flash_address(flash_addr, stat); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1176 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1177 } |
| 1700 | 1178 |
| 1179 block_size = cyg_flash_block_size(flash_addr); | |
| 1180 if (flash_addr & (block_size-1)) { | |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1181 diag_printf("Invalid FLASH address: %p\n", (void *)flash_addr); |
| 1700 | 1182 diag_printf(" must be 0x%x aligned\n", block_size); |
|
174
38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
jlarmour
parents:
172
diff
changeset
|
1183 return; |
|
38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
jlarmour
parents:
172
diff
changeset
|
1184 } |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1185 if ((mem_addr < (CYG_ADDRESS)ram_start) || |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1186 ((mem_addr+length) >= (CYG_ADDRESS)ram_end)) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1187 diag_printf("** WARNING: RAM address: %p may be invalid\n", (void *)mem_addr); |
|
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1188 diag_printf(" valid range is %p-%p\n", (void *)ram_start, (void *)ram_end); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1189 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1190 // Safety check - make sure the address range is not within the code we're running |
| 1746 | 1191 if (check_code_overlaps(flash_addr, (flash_addr+length-1))) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1192 diag_printf("Can't program this region - contains code in use!\n"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1193 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1194 } |
|
179
391299f9e541
Merge from eCos master repository on 2001-08-17-16:31:54-BST
jlarmour
parents:
177
diff
changeset
|
1195 if (!verify_action("* CAUTION * about to program FLASH\n at %p..%p from %p", |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1196 (void *)flash_addr, (void *)(flash_addr+length-1), |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1197 (void *)mem_addr)) { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1198 return; // The guy gave up |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1199 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1200 prog_ok = true; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1201 if (prog_ok) { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1202 // Erase area to be programmed |
| 1700 | 1203 if ((stat = cyg_flash_erase(flash_addr, length, &err_addr)) != 0) { |
| 1204 diag_printf("Can't erase region at %p: %s\n", err_addr, | |
| 1205 cyg_flash_errmsg(stat)); | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1206 prog_ok = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1207 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1208 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1209 if (prog_ok) { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1210 // Now program it |
| 1700 | 1211 if ((stat = cyg_flash_program(flash_addr, (void *)mem_addr, length, |
| 1212 &err_addr)) != 0) { | |
| 1213 diag_printf("Can't program region at %p: %s\n", err_addr, | |
| 1214 cyg_flash_errmsg(stat)); | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1215 prog_ok = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1216 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1217 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1218 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1219 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1220 static void |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1221 fis_erase(int argc, char *argv[]) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1222 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1223 int stat; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1224 unsigned long length; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1225 CYG_ADDRESS flash_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1226 bool flash_addr_set = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1227 bool length_set = false; |
| 1700 | 1228 cyg_flashaddr_t err_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1229 struct option_info opts[2]; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1230 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1231 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1232 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1233 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1234 (void *)&length, (bool *)&length_set, "length"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1235 if (!scan_opts(argc, argv, 2, opts, 2, (void **)0, 0, "")) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1236 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1237 fis_usage("invalid arguments"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1238 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1239 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1240 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1241 if (!flash_addr_set || !length_set) { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1242 fis_usage("missing argument"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1243 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1244 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1245 if (flash_addr_set && |
| 1700 | 1246 ((stat = cyg_flash_verify_addr(flash_addr)) || |
| 1247 (stat = cyg_flash_verify_addr((flash_addr+length-1))))) { | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1248 _show_invalid_flash_address(flash_addr, stat); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1249 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1250 } |
| 1700 | 1251 if (flash_addr_set && flash_addr & (cyg_flash_block_size(flash_addr)-1)) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1252 diag_printf("Invalid FLASH address: %p\n", (void *)flash_addr); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1253 diag_printf(" must be 0x%x aligned\n", flash_block_size); |
|
174
38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
jlarmour
parents:
172
diff
changeset
|
1254 return; |
|
38892b97b685
Merge from eCos master repository on 2001-07-28-00:17:32-BST
jlarmour
parents:
172
diff
changeset
|
1255 } |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1256 // Safety check - make sure the address range is not within the code we're running |
| 1746 | 1257 if (check_code_overlaps(flash_addr, (flash_addr+length-1))) { |
|
182
f62680ef1804
Merge from eCos master repository on 2001-09-07-06:43:02-BST
jlarmour
parents:
179
diff
changeset
|
1258 diag_printf("Can't erase this region - contains code in use!\n"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1259 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1260 } |
| 1700 | 1261 if ((stat = cyg_flash_erase(flash_addr, length, &err_addr)) != 0) { |
| 1262 diag_printf("Error erasing at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1263 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1264 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1265 |
|
177
4c750ce71ae3
Merge from eCos master repository on 2001-08-10-19:22:57-BST
jlarmour
parents:
174
diff
changeset
|
1266 #ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1267 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1268 static void |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1269 fis_lock(int argc, char *argv[]) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1270 { |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1271 char *name; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1272 int stat; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1273 unsigned long length; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1274 CYG_ADDRESS flash_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1275 bool flash_addr_set = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1276 bool length_set = false; |
| 1700 | 1277 cyg_flashaddr_t err_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1278 struct option_info opts[2]; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1279 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1280 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1281 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1282 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1283 (void *)&length, (bool *)&length_set, "length"); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1284 if (!scan_opts(argc, argv, 2, opts, 2, (void **)&name, OPTION_ARG_TYPE_STR, "image name")) |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1285 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1286 fis_usage("invalid arguments"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1287 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1288 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1289 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1290 /* Get parameters from image if specified */ |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1291 if (name) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1292 struct fis_image_desc *img; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1293 if ((img = fis_lookup(name, NULL)) == (struct fis_image_desc *)0) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1294 diag_printf("No image '%s' found\n", name); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1295 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1296 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1297 |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1298 flash_addr = img->flash_base; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1299 length = img->size; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1300 } else if (!flash_addr_set || !length_set) { |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1301 fis_usage("missing argument"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1302 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1303 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1304 if (flash_addr_set && |
| 1700 | 1305 ((stat = cyg_flash_verify_addr(flash_addr)) || |
| 1306 (stat = cyg_flash_verify_addr((flash_addr+length-1))))) { | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1307 _show_invalid_flash_address(flash_addr, stat); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1308 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1309 } |
| 1700 | 1310 if ((stat = cyg_flash_lock(flash_addr, length, &err_addr)) != 0) { |
| 1311 diag_printf("Error locking at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1312 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1313 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1314 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1315 static void |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1316 fis_unlock(int argc, char *argv[]) |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1317 { |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1318 char *name; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1319 int stat; |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1320 unsigned long length; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1321 CYG_ADDRESS flash_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1322 bool flash_addr_set = false; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1323 bool length_set = false; |
| 1700 | 1324 cyg_flashaddr_t err_addr; |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1325 struct option_info opts[2]; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1326 |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1327 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1328 (void *)&flash_addr, (bool *)&flash_addr_set, "FLASH memory base address"); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1329 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM, |
| 1513 | 1330 (void *)&length, (bool *)&length_set, "length"); |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1331 if (!scan_opts(argc, argv, 2, opts, 2, (void **)&name, OPTION_ARG_TYPE_STR, "image name")) |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1332 { |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1333 fis_usage("invalid arguments"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1334 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1335 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1336 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1337 if (name) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1338 struct fis_image_desc *img; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1339 if ((img = fis_lookup(name, NULL)) == (struct fis_image_desc *)0) { |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1340 diag_printf("No image '%s' found\n", name); |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1341 return; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1342 } |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1343 |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1344 flash_addr = img->flash_base; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1345 length = img->size; |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1346 } else if (!flash_addr_set || !length_set) { |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1347 fis_usage("missing argument"); |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1348 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1349 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1350 if (flash_addr_set && |
| 1700 | 1351 ((stat = cyg_flash_verify_addr(flash_addr)) || |
| 1352 (stat = cyg_flash_verify_addr((flash_addr+length-1))))) { | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1353 _show_invalid_flash_address(flash_addr, stat); |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1354 return; |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1355 } |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1356 |
| 1700 | 1357 if ((stat = cyg_flash_unlock(flash_addr, length, &err_addr)) != 0) { |
| 1358 diag_printf("Error unlocking at %p: %s\n", err_addr, cyg_flash_errmsg(stat)); | |
|
162
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1359 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1360 } |
|
2395031e7a66
Merge from eCos master repository on 2001-06-15-06:43:03-BST
jlarmour
parents:
161
diff
changeset
|
1361 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1362 |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1363 // This is set non-zero if the FLASH subsystem has successfully been initialized |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
1364 int __flash_init = 0; |
|
171
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1365 |
|
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1366 void |
|
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1367 _flash_info(void) |
| 1700 | 1368 { |
| 1369 cyg_uint32 i=0,j; | |
| 1370 cyg_flash_info_t info; | |
| 1371 int ret; | |
| 1372 | |
|
171
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1373 if (!__flash_init) return; |
| 1700 | 1374 |
| 1375 do { | |
| 1376 ret = cyg_flash_get_info(i, &info); | |
| 1377 if (ret == CYG_FLASH_ERR_OK) { | |
| 1378 diag_printf("FLASH: %p - %p ", info.start, info.end); | |
| 1379 for (j=0;j < info.num_block_infos; j++) { | |
| 1380 diag_printf("%d x 0x%x blocks ", | |
| 1381 info.block_info[j].blocks, | |
| 1382 info.block_info[j].block_size); | |
| 1383 } | |
| 1384 diag_printf("\n"); | |
| 1385 } | |
| 1386 i++; | |
| 1387 } while (ret != CYG_FLASH_ERR_INVALID); | |
|
171
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1388 } |
|
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1389 |
|
1223
dbcfe4e0dbd2
New platform - TAMS MOAB - and generic changes to support it
gthomas
parents:
1208
diff
changeset
|
1390 bool |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1391 do_flash_init(void) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1392 { |
|
1721
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1393 int stat, i; |
|
1737
dcf02dfe567d
* src/flash.c (do_flash_init): Fix compiler warning about an
asl
parents:
1734
diff
changeset
|
1394 cyg_flash_info_t info; |
|
dcf02dfe567d
* src/flash.c (do_flash_init): Fix compiler warning about an
asl
parents:
1734
diff
changeset
|
1395 #ifdef CYGOPT_REDBOOT_FIS |
| 1700 | 1396 cyg_flashaddr_t err_addr; |
|
1737
dcf02dfe567d
* src/flash.c (do_flash_init): Fix compiler warning about an
asl
parents:
1734
diff
changeset
|
1397 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1398 |
|
171
42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
jlarmour
parents:
165
diff
changeset
|
1399 if (!__flash_init) { |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1400 __flash_init = 1; |
| 1700 | 1401 |
| 1402 if ((stat = cyg_flash_init(diag_printf)) != 0) { | |
| 1403 diag_printf("FLASH: driver init failed: %s\n", cyg_flash_errmsg(stat)); | |
| 1404 return false; | |
| 1405 } | |
|
1717
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1406 |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1407 #ifdef CYGNUM_REDBOOT_FLASH_BASE |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1408 stat = cyg_flash_get_info_addr(CYGNUM_REDBOOT_FLASH_BASE, &info); |
|
1721
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1409 #else |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1410 stat = cyg_flash_get_info(0, &info); |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1411 #endif |
|
1717
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1412 if (stat != CYG_FLASH_ERR_OK) { |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1413 diag_printf("FLASH: driver init failed: %s\n", |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1414 cyg_flash_errmsg(stat)); |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1415 return false; |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1416 } |
|
faaea4243d52
* cdl/redboot.cdl: Fixed the type of CYGNUM_REDBOOT_FLASH_BASE
asl
parents:
1700
diff
changeset
|
1417 flash_start = info.start; |
| 1740 | 1418 flash_end = info.end; |
|
1721
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1419 |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1420 // No bootblock support yet, so we merge any bootblocks we might |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1421 // find into full size blocks |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1422 for (i=0; i < info.num_block_infos; i++) { |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1423 if (info.block_info[i].block_size > flash_block_size) { |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1424 flash_block_size = info.block_info[i].block_size; |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1425 } |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1426 } |
|
1721
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1427 flash_num_blocks = 0; |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1428 for (i=0; i < info.num_block_infos; i++) { |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1429 flash_num_blocks += (info.block_info[i].block_size * |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1430 info.block_info[i].blocks) / |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1431 flash_block_size; |
|
16115b7a4b8c
* src/flash.c (do_flash_init): cyg_flash_get_limits has been removed.
asl
parents:
1717
diff
changeset
|
1432 } |
| 1700 | 1433 |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1434 #ifdef CYGOPT_REDBOOT_FIS |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1435 fisdir_size = CYGNUM_REDBOOT_FIS_DIRECTORY_ENTRY_COUNT * CYGNUM_REDBOOT_FIS_DIRECTORY_ENTRY_SIZE; |
|
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1436 fisdir_size = ((fisdir_size + flash_block_size - 1) / flash_block_size) * flash_block_size; |
|
1492
8b3549abe4ac
* cdl/redboot.cdl: Bring CYGNUM_REDBOOT_LOAD_ZLIB_BUFFER under
jlarmour
parents:
1393
diff
changeset
|
1437 # if defined(CYGPRI_REDBOOT_ZLIB_FLASH) && defined(CYGOPT_REDBOOT_FIS_ZLIB_COMMON_BUFFER) |
|
307
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1438 fis_work_block = fis_zlib_common_buffer; |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1439 if(CYGNUM_REDBOOT_FIS_ZLIB_COMMON_BUFFER_SIZE < fisdir_size) { |
|
307
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1440 diag_printf("FLASH: common buffer too small\n"); |
|
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1441 return false; |
|
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1442 } |
|
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1443 # else |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1444 workspace_end = (unsigned char *)(workspace_end-fisdir_size); |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1445 fis_work_block = workspace_end; |
|
307
906a5d289c6d
Better memory use vis FIS & ZLIB - from Thomas Koeller
gthomas
parents:
284
diff
changeset
|
1446 # endif |
| 1700 | 1447 |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1448 if (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK < 0) { |
| 1700 | 1449 fis_addr = ((CYG_ADDRESS)flash_end + 1 + |
| 1450 (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK*flash_block_size)); | |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1451 } else { |
| 1700 | 1452 fis_addr = ((CYG_ADDRESS)flash_start + |
| 1453 (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK*flash_block_size)); | |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
202
diff
changeset
|
1454 } |
| 1700 | 1455 |
|
1312
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1456 if (((CYG_ADDRESS)fis_addr + fisdir_size - 1) > (CYG_ADDRESS)flash_end) { |
|
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1457 diag_printf("FIS directory doesn't fit\n"); |
|
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1458 return false; |
|
08edfb52f9cd
Improve FIS directory handling - should work with small block size devices
gthomas
parents:
1301
diff
changeset
|
1459 } |
| 1700 | 1460 |
| 1461 cyg_flash_read(fis_addr, fis_work_block, fisdir_size, &err_addr); | |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1462 #endif |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1463 } |
| 1700 | 1464 |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1465 return true; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1466 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1467 |
|
191
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1468 // Wrapper to avoid compiler warnings |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1469 static void |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1470 _do_flash_init(void) |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1471 { |
| 1268 | 1472 static int init_done = 0; |
| 1473 if (init_done) return; | |
| 1474 init_done = 1; | |
|
191
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1475 do_flash_init(); |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1476 } |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1477 |
|
678094f34118
Merge from eCos master repository on 2001-10-19-06:43:02-BST
jlarmour
parents:
184
diff
changeset
|
1478 RedBoot_init(_do_flash_init, RedBoot_INIT_FIRST); |
|
172
cd45958b28ff
Merge from eCos master repository on 2001-07-20-10:24:43-BST
jlarmour
parents:
171
diff
changeset
|
1479 |
|
160
0d0f03f76f6a
Merge from eCos master repository on 2001-06-01-18:52:13-BST
jlarmour
parents:
159
diff
changeset
|
1480 static void |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1481 do_fis(int argc, char *argv[]) |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1482 { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1483 struct cmd *cmd; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1484 |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1485 if (argc < 2) { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1486 fis_usage("too few arguments"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1487 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1488 } |
|
184
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1489 if (!do_flash_init()) { |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1490 diag_printf("Sorry, no FLASH memory is available\n"); |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1491 return; |
|
022f1e506033
Merge from eCos master repository on 2001-10-02-17:59:22-BST
jlarmour
parents:
183
diff
changeset
|
1492 } |
|
115
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1493 if ((cmd = cmd_search(__FIS_cmds_TAB__, &__FIS_cmds_TAB_END__, |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1494 argv[1])) != (struct cmd *)0) { |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1495 (cmd->fun)(argc, argv); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1496 return; |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1497 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1498 fis_usage("unrecognized command"); |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1499 } |
|
6ed91473a1cd
Merge from eCos master repository on 2000-08-21-22:40:54-BST
jlarmour
parents:
diff
changeset
|
1500 |
|
154
e2d866e32dac
Merge from eCos master repository on 2001-02-26-23:18:05-GMT
jlarmour
parents:
153
diff
changeset
|
1501 // EOF flash.c |