flash_v2: packages/redboot/current/src/flash.c annotate

annotate packages/redboot/current/src/flash.c @ 962:0138b3d6b8a0

* src/flash.c: Only perform RAM check in fis load command when CYGSEM_REDBOOT_VALIDATE_USER_RAM_LOADS = 1

author	jlarmour
date	Thu, 24 Apr 2003 03:33:04 +0000
parents	23fd347aba65
children	7071bcbe4d30

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 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	11 // Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	12 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	13 // 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	14 // 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	15 // 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	16 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	17 // 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	18 // 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	19 // 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	20 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	21 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	22 // 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	23 // 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	24 // 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	25 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	26 // 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	27 // 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	28 // 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	29 // 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	30 // 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	31 // 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	32 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	33 // 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	34 // 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	35 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	36 // 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	37 // 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	38 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	39 //####ECOSGPLCOPYRIGHTEND####
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	40 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	41 //#####DESCRIPTIONBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	42 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	43 // Author(s): gthomas
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	44 // Contributors: gthomas, tkoeller
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	45 // Date: 2000-07-28
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	46 // Purpose:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	47 // Description:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	48 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	49 // 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	50 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	51 //####DESCRIPTIONEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	52 //
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 #include <redboot.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	56 #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	57 #include <fis.h>
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	58 #include <sib.h>
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	59
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	60 #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	61 // 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	62 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	63
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	64 // Round a quantity up
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	65 #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	66
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	67 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	68 #include <flash_config.h>
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	69
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	70 // Configuration data, saved in FLASH, used to set/update RedBoot
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	71 // normal "configuration" data items.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	72 static struct _config {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	73 unsigned long len;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	74 unsigned long key1;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	75 unsigned char config_data[MAX_CONFIG_DATA-(4*4)];
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	76 unsigned long key2;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	77 unsigned long cksum;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	78 } config, backup_config;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	79 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG_READONLY_FALLBACK
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	80 static struct _config *readonly_config;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	81 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	82 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	83
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	84 #ifdef CYGOPT_REDBOOT_FIS
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	85 // Image management functions
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	86 local_cmd_entry("init",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	87 "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	88 "[-f]",
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	89 fis_init,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	90 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	91 );
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	92 #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	93 # 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	94 #else
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	95 # define FIS_LIST_OPTS "[-d]"
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	96 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	97 local_cmd_entry("list",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	98 "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	99 FIS_LIST_OPTS,
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	100 fis_list,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	101 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	102 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	103 local_cmd_entry("free",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	104 "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	105 "",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	106 fis_free,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	107 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	108 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	109 local_cmd_entry("delete",
388 38dad94e75ce Min BOOTP/vendor size. Fix typo in FIS/DELETE. gthomas parents: 310 diff changeset	110 "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	111 "name",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	112 fis_delete,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	113 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	114 );
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	115
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	116 static char fis_load_usage[] =
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	117 #ifdef CYGPKG_COMPRESS_ZLIB
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	118 "[-d] "
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	119 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	120 "[-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	121
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	122 local_cmd_entry("load",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	123 "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	124 fis_load_usage,
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	125 fis_load,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	126 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	127 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	128 local_cmd_entry("create",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	129 "Create an image",
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	130 "-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	131 " [-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	132 fis_create,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	133 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	134 );
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	135 #endif
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	136
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	137 // Raw flash access functions
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	138 local_cmd_entry("erase",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	139 "Erase FLASH contents",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	140 "-f <flash_addr> -l <length>",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	141 fis_erase,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	142 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	143 );
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	144 #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	145 local_cmd_entry("lock",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	146 "LOCK FLASH contents",
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	147 "[-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	148 fis_lock,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	149 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	150 );
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	151 local_cmd_entry("unlock",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	152 "UNLOCK FLASH contents",
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	153 "[-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	154 fis_unlock,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	155 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	156 );
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	157 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	158 local_cmd_entry("write",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	159 "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	160 "-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	161 fis_write,
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	162 FIS_cmds
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	163 );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	164
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	165 // Define table boundaries
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	166 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	167 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	168
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	169 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	170
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	171 // CLI function
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	172 static cmd_fun do_fis;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	173 RedBoot_nested_cmd("fis",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	174 "Manage FLASH images",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	175 "{cmds}",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	176 do_fis,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	177 __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	178 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	179
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	180 // Local data used by these routines
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	181 static void flash_start, flash_end;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	182 static int flash_block_size, flash_num_blocks;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	183 #ifdef CYGOPT_REDBOOT_FIS
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	184 static void *fis_work_block;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	185 static void *fis_addr;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	186 static int fisdir_size; // Size of FIS directory.
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	187 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	188 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	189 static void *cfg_base; // Location in Flash of config data
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	190 static int cfg_size; // Length of config data - rounded to Flash block size
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	191 // Prototypes for local functions
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	192 static unsigned char flash_lookup_config(char key);
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	193 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	194
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	195 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	196 fis_usage(char *why)
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	197 {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	198 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	199 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	200 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	201
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	202 static void
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	203 _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	204 {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	205 diag_printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	206 diag_printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	207 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	208
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	209 #ifdef CYGOPT_REDBOOT_FIS
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	210 struct fis_image_desc *
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	211 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	212 {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	213 int i;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	214 struct fis_image_desc *img;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	215
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	216 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	217 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	218 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	219 (strcasecmp(name, img->name) == 0)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	220 if (num) *num = i;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	221 return img;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	222 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	223 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	224 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	225 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	226
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	227 static void
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	228 fis_update_directory(void)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	229 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	230 int stat;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	231 void *err_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	232
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	233 #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	234 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	235 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	236 #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	237 // Ensure [quietly] that the directory is unlocked before trying to update
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	238 flash_unlock((void )fis_addr, flash_block_size, (void *)&err_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	239 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	240 if ((stat = flash_erase(fis_addr, flash_block_size, (void **)&err_addr)) != 0) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	241 diag_printf("Error erasing FIS directory at %p: %s\n", err_addr, flash_errmsg(stat));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	242 } else {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	243 if ((stat = flash_program(fis_addr, fis_work_block, flash_block_size,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	244 (void **)&err_addr)) != 0) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	245 diag_printf("Error writing FIS directory at %p: %s\n",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	246 err_addr, flash_errmsg(stat));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	247 }
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_LOCK_SPECIAL
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	250 // Ensure [quietly] that the directory is locked after the update
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	251 flash_lock((void )fis_addr, flash_block_size, (void *)&err_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	252 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	253 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	254
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	255 static void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	256 fis_init(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	257 {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	258 int stat;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	259 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	260 void *err_addr;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	261 bool full_init = false;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	262 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	263 CYG_ADDRESS redboot_flash_start;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	264 unsigned long redboot_image_size;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	265
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	266 init_opts(&opts[0], 'f', false, OPTION_ARG_TYPE_FLG,
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	267 (void *)&full_init, (bool )0, "full initialization, erases all of flash");
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	268 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	269 {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	270 return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	271 }
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	272
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	273 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	274 diag_printf("** Aborted\n");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	275 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	276 }
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	277 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	278
d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	279 #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	280 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	281 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	282
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	283 // 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	284 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	285 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	286 #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	287 memset(img, 0, sizeof(*img));
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	288 strcpy(img->name, "(reserved)");
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	289 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	290 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	291 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	292 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	293 #endif
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	294 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	295 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	296 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	297 strcpy(img->name, "RedBoot");
147 d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	298 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	299 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	300 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	301 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	302 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	303 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	304 #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	305 #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	306 // 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	307 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	308 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	309 memset(img, 0, sizeof(*img));
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	310 strcpy(img->name, "RedBoot[post]");
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	311 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	312 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	313 img->size = redboot_image_size;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	314 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	315 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	316 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	317 #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	318 // And a backup image
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	319 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	320 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	321 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	322 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	323 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	324 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	325 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	326 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	328 // 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	329 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	330 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	331 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	332 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	333 img->size = cfg_size;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	334 img++;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	335 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	336 // 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	337 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	338 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	339 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	340 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	341 img->size = fisdir_size;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	342 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	343
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	344 #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	345 // 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	346 // 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	347 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	348 // 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	349 // Monitor as a reserved area.
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	350 {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	351 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	352 cyg_uint32 check = 0;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	353 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	354 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	355
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	356 // 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	357 // 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	358 // 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	359 // 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	360 #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	361 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	362 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	363 #else
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	364 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	365 #endif
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	366 footer_p->infoBase = NULL;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	367 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	368 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	369
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	370 // and compute its checksum
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	371 for ( ; count > 0; count--) {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	372 if (*check_ptr > ~check)
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	373 check++;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	374 check += *check_ptr++;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	375 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	376 footer_p->checksum = ~check;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	377 }
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	378 #endif
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	379
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	380 // 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	381 // 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	382
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	383 if (full_init) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	384 unsigned long erase_size;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	385 CYG_ADDRESS erase_start;
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	386 // 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	387 // and config block.
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	388 // 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	389 #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	390 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	391 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	392 if ( erase_size > erase_start ) {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	393 erase_size -= erase_start;
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	394 if ((stat = flash_erase((void *)erase_start, erase_size,
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	395 (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	396 diag_printf(" initialization failed at %p: %s\n",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	397 err_addr, flash_errmsg(stat));
154 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 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	400 #endif
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	401 // 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	402 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	403 // 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	404 // blocks.
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	405 #if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && !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	406 if (fis_addr > cfg_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)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	408 } else {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	409 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	410 }
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	411 if ((stat = flash_erase((void *)erase_start, erase_size,
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	412 (void **)&err_addr)) != 0) {
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	413 diag_printf(" initialization failed %p: %s\n",
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	414 err_addr, flash_errmsg(stat));
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	415 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	416 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	417 if (fis_addr > cfg_base) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	418 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	419 } else {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	420 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	421 }
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	422 if ((stat = flash_erase((void *)erase_start, erase_size,
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	423 (void **)&err_addr)) != 0) {
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	424 diag_printf(" initialization failed %p: %s\n",
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	425 err_addr, flash_errmsg(stat));
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	426 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	427 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	428 #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	429 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	430 if ((stat = flash_erase((void *)erase_start, erase_size,
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	431 (void **)&err_addr)) != 0) {
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	432 diag_printf(" initialization failed %p: %s\n",
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	433 err_addr, flash_errmsg(stat));
9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	434 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	435 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	436 #endif
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	437 // 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	438 erase_size = ((CYG_ADDRESS)flash_end - erase_start) + 1;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	439 if ((stat = flash_erase((void *)erase_start, erase_size,
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	440 (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	441 diag_printf(" initialization failed at %p: %s\n",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	442 err_addr, flash_errmsg(stat));
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	443 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	444 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	445 diag_printf(" Warning: device contents not erased, some blocks may not be usable\n");
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	446 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	447
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	448 fis_update_directory();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	449 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	450
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	451 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	452 fis_list(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	453 {
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	454 struct fis_image_desc *img;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	455 int i;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	456 bool show_cksums = false;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	457 bool show_datalen = false;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	458 struct option_info opts[2];
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	459
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	460 #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	461 // 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	462 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	463 arm_fis_list();
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	464 return;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	465 #endif
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	466
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	467 init_opts(&opts[0], 'd', false, OPTION_ARG_TYPE_FLG,
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	468 (void *)&show_datalen, (bool )0, "display data length");
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	469 #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	470 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG,
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	471 (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	472 i = 2;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	473 #else
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	474 i = 1;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	475 #endif
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	476 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	477 {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	478 return;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	479 }
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	480 img = (struct fis_image_desc *) fis_addr;
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	481 // 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	482 // cols by hand....
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	483 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	484 "Name","FLASH addr",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	485 show_cksums ? "Checksum" : "Mem addr",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	486 show_datalen ? "Datalen" : "Length",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	487 "Entry point" );
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	488 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	489 if (img->name[0] != (unsigned char)0xFF) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	490 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	491 img->flash_base,
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	492 #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	493 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	494 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	495 #else
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	496 img->mem_base,
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	497 img->size,
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	498 #endif
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	499 img->entry_point);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	500 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	501 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	502 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	503
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	504 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	505 fis_free(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	506 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	507 unsigned long fis_ptr, fis_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	508 unsigned long *area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	509
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	510 // Do not search the area reserved for pre-RedBoot systems:
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	511 fis_ptr = (unsigned long *)((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	512 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	513 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	514 while (fis_ptr < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	515 if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	516 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	517 // 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	518 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	519 (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	520 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	521 // Find next blank block
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	522 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	523 while (area_start < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	524 if (*area_start == (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	525 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	526 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	527 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	528 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	529 fis_ptr = area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	530 } else {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	531 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	532 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	533 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	534 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	535 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	536 (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	537 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	538 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	539
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	540 // 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	541 static bool
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	542 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	543 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	544 unsigned long fis_ptr, fis_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	545 unsigned long *area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	546
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	547 // Do not search the area reserved for pre-RedBoot systems:
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	548 fis_ptr = (unsigned long *)((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	549 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	550 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	551 while (fis_ptr < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	552 if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	553 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	554 // 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	555 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	556 *addr = (CYG_ADDRESS)area_start;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	557 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	558 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	559 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	560 // Find next blank block
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	561 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	562 while (area_start < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	563 if (*area_start == (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	564 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	565 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	566 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	567 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	568 fis_ptr = area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	569 } else {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	570 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	571 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	572 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	573 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	574 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	575 *addr = (CYG_ADDRESS)area_start;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	576 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	577 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	578 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	579 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	580 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	581
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	582 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	583 fis_create(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	584 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	585 int i, stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	586 unsigned long length, img_size;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	587 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	588 char *name;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	589 bool mem_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	590 bool exec_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	591 bool entry_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	592 bool flash_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	593 bool length_set = false;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	594 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	595 bool no_copy = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	596 void *err_addr;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	597 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	598 bool defaults_assumed;
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	599 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	600 bool prog_ok = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	601
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	602 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	603 (void *)&mem_addr, (bool )&mem_addr_set, "memory base address");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	604 init_opts(&opts[1], 'r', true, OPTION_ARG_TYPE_NUM,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	605 (void *)&exec_addr, (bool )&exec_addr_set, "ram base address");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	606 init_opts(&opts[2], 'e', true, OPTION_ARG_TYPE_NUM,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	607 (void *)&entry_addr, (bool )&entry_addr_set, "entry point address");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	608 init_opts(&opts[3], 'f', true, OPTION_ARG_TYPE_NUM,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	609 (void *)&flash_addr, (bool )&flash_addr_set, "FLASH memory base address");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	610 init_opts(&opts[4], 'l', true, OPTION_ARG_TYPE_NUM,
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	611 (void *)&length, (bool )&length_set, "image length [in FLASH]");
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	612 init_opts(&opts[5], 's', true, OPTION_ARG_TYPE_NUM,
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	613 (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	614 init_opts(&opts[6], 'n', false, OPTION_ARG_TYPE_FLG,
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	615 (void *)&no_copy, (bool )0, "don't copy from RAM to FLASH, just update directory");
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	616 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	617 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	618 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	619 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	620 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	621
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	622 memcpy(fis_work_block, fis_addr, fisdir_size);
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	623 defaults_assumed = false;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	624 if (name) {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	625 // 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	626 img = fis_lookup(name, NULL);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	627 if (img) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	628 // 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	629 if (!length_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	630 length_set = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	631 length = img->size;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	632 defaults_assumed = true;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	633 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	634 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	635 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	636 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	637 (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	638 mem_addr = load_address;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	639 mem_addr_set = true;
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	640 defaults_assumed = true;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	641 // 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	642 if (!entry_addr_set)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	643 entry_addr = entry_address;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	644 if (!length_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	645 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	646 length_set = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	647 } 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	648 /* 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	649 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	650 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	651 img_size_set = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	652 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	653 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	654 // 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	655 if (img) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	656 if (!exec_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	657 // Preserve "normal" behaviour
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	658 exec_addr_set = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	659 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	660 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	661 if (!flash_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	662 flash_addr_set = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	663 flash_addr = img->flash_base;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	664 defaults_assumed = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	665 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	666 }
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	667
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	668 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	669 !length_set \|\| !name) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	670 fis_usage("required parameter missing");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	671 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	672 }
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	673 if (!img_size_set) {
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	674 img_size = length;
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	675 }
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	676 // 'length' is size of FLASH image, 'img_size' is actual data size
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	677 // Round up length to FLASH block size
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	678 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	679 length = ((length + flash_block_size - 1) / flash_block_size) * flash_block_size;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	680 if (length < img_size) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	681 diag_printf("Invalid FLASH image size/length combination\n");
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	682 return;
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	683 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	684 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	685 if (flash_addr_set &&
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	686 ((stat = flash_verify_addr((void *)flash_addr)) \|\|
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	687 (stat = flash_verify_addr((void *)(flash_addr+img_size-1))))) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	688 _show_invalid_flash_address(flash_addr, stat);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	689 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	690 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	691 if (flash_addr_set && flash_addr & (flash_block_size-1)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	692 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	693 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	694 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	695 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	696 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	697 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	698 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	699 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	700 if (!no_copy) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	701 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	702 ((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	703 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	704 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	705 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	706 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	707 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	708 return;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	709 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	710 }
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	711 // 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	712 if (img) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	713 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	714 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	715 " 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	716 flash_addr, img->flash_base);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	717
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	718 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	719 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	720 if (img->size != length) {
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	721 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	722 " 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	723 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	724 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	725 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	726 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	727 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	728 } else {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	729 if (defaults_assumed) {
310 113a540ea6db Improve FLASH create - from Thomas Koeller gthomas parents: 307 diff changeset	730 if (no_copy &&
113a540ea6db Improve FLASH create - from Thomas Koeller gthomas parents: 307 diff changeset	731 !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	732 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	733 (void *)mem_addr)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	734 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	735 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	736 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	737 }
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	738 } else {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	739 // If not 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	740 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	741 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	742 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	743 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	744 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	745 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	746 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	747 if (!no_copy) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	748 // Safety check - make sure the address range is not within the code we're running
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	749 if (flash_code_overlaps((void )flash_addr, (void )(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	750 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	751 return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	752 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	753 if (prog_ok) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	754 // Erase area to be programmed
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	755 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	756 diag_printf("Can't erase region at %p: %s\n", err_addr, flash_errmsg(stat));
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	757 prog_ok = false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	758 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	759 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	760 if (prog_ok) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	761 // Now program it
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	762 if ((stat = flash_program((void )flash_addr, (void )mem_addr, img_size, (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	763 diag_printf("Can't program region at %p: %s\n", err_addr, flash_errmsg(stat));
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	764 prog_ok = false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	765 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	766 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	767 }
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	768 if (prog_ok) {
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	769 // Update directory
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	770 memset(img, 0, sizeof(*img));
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	771 strcpy(img->name, name);
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	772 img->flash_base = flash_addr;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	773 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	774 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	775 img->size = length;
391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	776 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	777 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	778 img->file_cksum = cyg_crc32((unsigned char *)flash_addr, img_size);
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	779 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	780 fis_update_directory();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	781 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	782 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	783
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	784 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	785 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	786 fis_delete(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	787 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	788 char *name;
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	789 int num_reserved, i, stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	790 void *err_addr;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	791 struct fis_image_desc *img;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	792
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	793 if (!scan_opts(argc, argv, 2, 0, 0, (void **)&name, OPTION_ARG_TYPE_STR, "image name"))
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	794 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	795 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	796 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	797 }
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	798 #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	799 // 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	800 arm_fis_delete(name);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	801 return;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	802 #endif
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	803 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	804 num_reserved = 0;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	805 #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	806 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	807 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	808 #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	809 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	810 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	811 #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	812 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	813 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	814 #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	815 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	816 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	817 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	818 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	819 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	820 #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	821 num_reserved++;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	822 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	823
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	824 memcpy(fis_work_block, fis_addr, fisdir_size);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	825 img = fis_lookup(name, &i);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	826 if (img) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	827 if (i < num_reserved) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	828 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	829 return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	830 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	831 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	832 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	833 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	834 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	835 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	836 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	837 }
119 77cec8369160 Merge from eCos master repository on 2000-09-01-07:47:03-BST jlarmour parents: 117 diff changeset	838 // Erase Data blocks (free space)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	839 if ((stat = flash_erase((void )img->flash_base, img->size, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	840 diag_printf("Error erasing at %p: %s\n", err_addr, flash_errmsg(stat));
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	841 } else {
280 96e3418e1f5b From Jani Monoses: fix HTTP loading, FIS delete gthomas parents: 210 diff changeset	842 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	843 fis_update_directory();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	844 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	845 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	846
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	847 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	848 fis_load(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	849 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	850 char *name;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	851 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	852 CYG_ADDRESS mem_addr;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	853 bool mem_addr_set = false;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	854 bool show_cksum = false;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	855 struct option_info opts[3];
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	856 #ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	857 unsigned long cksum;
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	858 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	859 int num_options;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	860 #ifdef CYGPKG_COMPRESS_ZLIB
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	861 bool decompress = false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	862 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	863
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	864 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM,
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	865 (void *)&mem_addr, (bool )&mem_addr_set, "memory [load] base address");
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	866 init_opts(&opts[1], 'c', false, OPTION_ARG_TYPE_FLG,
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	867 (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	868 num_options = 2;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	869 #ifdef CYGPKG_COMPRESS_ZLIB
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	870 init_opts(&opts[num_options], 'd', false, OPTION_ARG_TYPE_FLG,
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	871 (void **)&decompress, 0, "decompress");
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	872 num_options++;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	873 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	874
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	875 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	876 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	877 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	878 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	879 }
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	880 memcpy(fis_work_block, fis_addr, fisdir_size);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	881 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	882 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	883 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	884 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	885 if (!mem_addr_set) {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	886 mem_addr = img->mem_base;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	887 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	888 // 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	889 #ifdef CYGSEM_REDBOOT_VALIDATE_USER_RAM_LOADS
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	890 if ((mem_addr < (CYG_ADDRESS)user_ram_start) \|\|
310 113a540ea6db Improve FLASH create - from Thomas Koeller gthomas parents: 307 diff changeset	891 ((mem_addr+img->data_length) >= (CYG_ADDRESS)user_ram_end)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	892 diag_printf("Not a loadable image\n");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	893 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	894 }
962 0138b3d6b8a0 * src/flash.c: Only perform RAM check in fis load command when jlarmour parents: 849 diff changeset	895 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	896 #ifdef CYGPKG_COMPRESS_ZLIB
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	897 if (decompress) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	898 int err;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	899 _pipe_t fis_load_pipe;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	900 _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	901 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	902 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	903 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	904 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	905
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	906 err = (*_dc_init)(p);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	907
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	908 if (0 == err)
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	909 err = (*_dc_inflate)(p);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	910
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	911 // 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	912 // error value.
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	913 err = (*_dc_close)(p, err);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	914
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	915 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	916 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	917 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	918 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	919 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	920
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	921 // Set load address/top
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	922 load_address = mem_addr;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	923 load_address_end = (unsigned long)p->out_buf;
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	924
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	925 // Reload fis directory
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	926 memcpy(fis_work_block, fis_addr, fisdir_size);
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	927 } else // dangling block
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	928 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	929 {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	930 memcpy((void )mem_addr, (void )img->flash_base, img->data_length);
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	931
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	932 // Set load address/top
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	933 load_address = mem_addr;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	934 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	935 }
196 9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT jlarmour parents: 195 diff changeset	936 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	937
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	938 #ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	939 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	940 if (show_cksum) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	941 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	942 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	943 // 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	944 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	945 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	946 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	947 img->file_cksum, cksum);
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	948 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	949 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	950 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	951 }
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	952 #endif // CYGOPT_REDBOOT_FIS
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	953
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	954 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	955 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	956 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	957 int stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	958 unsigned long length;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	959 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	960 bool mem_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	961 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	962 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	963 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	964 struct option_info opts[3];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	965 bool prog_ok;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	966
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	967 init_opts(&opts[0], 'b', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	968 (void *)&mem_addr, (bool )&mem_addr_set, "memory base address");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	969 init_opts(&opts[1], 'f', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	970 (void *)&flash_addr, (bool )&flash_addr_set, "FLASH memory base address");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	971 init_opts(&opts[2], 'l', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	972 (void *)&length, (bool )&length_set, "image length [in FLASH]");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	973 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	974 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	975 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	976 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	977 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	978
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	979 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	980 fis_usage("required parameter missing");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	981 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	982 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	983
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	984 // Round up length to FLASH block size
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	985 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	986 length = ((length + flash_block_size - 1) / flash_block_size) * flash_block_size;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	987 #endif
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	988 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	989 ((stat = flash_verify_addr((void *)flash_addr)) \|\|
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	990 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	991 _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	992 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	993 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	994 if (flash_addr_set && flash_addr & (flash_block_size-1)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	995 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	996 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	997 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	998 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	999 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	1000 ((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	1001 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	1002 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	1003 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1004 // Safety check - make sure the address range is not within the code we're running
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1005 if (flash_code_overlaps((void )flash_addr, (void )(flash_addr+length-1))) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1006 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	1007 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1008 }
179 391299f9e541 Merge from eCos master repository on 2001-08-17-16:31:54-BST jlarmour parents: 177 diff changeset	1009 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	1010 (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	1011 (void *)mem_addr)) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1012 return; // The guy gave up
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1013 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1014 prog_ok = true;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1015 if (prog_ok) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1016 // Erase area to be programmed
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1017 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1018 diag_printf("Can't erase region at %p: %s\n", err_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1019 prog_ok = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1020 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1021 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1022 if (prog_ok) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1023 // Now program it
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1024 if ((stat = flash_program((void )flash_addr, (void )mem_addr, length, (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1025 diag_printf("Can't program region at %p: %s\n", err_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1026 prog_ok = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1027 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1028 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1029 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1030
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1031 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1032 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	1033 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1034 int stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1035 unsigned long length;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1036 CYG_ADDRESS flash_addr;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1037 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1038 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1039 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1040 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1041
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1042 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1043 (void *)&flash_addr, (bool )&flash_addr_set, "FLASH memory base address");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1044 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1045 (void *)&length, (bool )&length_set, "length");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1046 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	1047 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1048 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1049 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1050 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1051
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1052 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	1053 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1054 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1055 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1056 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1057 ((stat = flash_verify_addr((void *)flash_addr)) \|\|
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1058 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1059 _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	1060 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1061 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1062 if (flash_addr_set && flash_addr & (flash_block_size-1)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1063 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	1064 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	1065 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	1066 }
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1067 // Safety check - make sure the address range is not within the code we're running
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1068 if (flash_code_overlaps((void )flash_addr, (void )(flash_addr+length-1))) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1069 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	1070 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1071 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1072 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1073 diag_printf("Error erasing at %p: %s\n", err_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1074 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1075 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1076
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1077 #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	1078
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1079 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1080 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	1081 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1082 char *name;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1083 int stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1084 unsigned long length;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1085 CYG_ADDRESS flash_addr;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1086 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1087 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1088 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1089 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1090
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1091 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1092 (void *)&flash_addr, (bool )&flash_addr_set, "FLASH memory base address");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1093 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1094 (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	1095 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	1096 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1097 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1098 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1099 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1100
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1101 /* 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	1102 if (name) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1103 struct fis_image_desc *img;
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1104 memcpy(fis_work_block, fis_addr, fisdir_size);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1105 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	1106 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	1107 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1108 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1109
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1110 flash_addr = img->flash_base;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1111 length = img->size;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1112 } 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	1113 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1114 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1115 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1116 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1117 ((stat = flash_verify_addr((void *)flash_addr)) \|\|
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1118 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1119 _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	1120 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1121 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1122 if ((stat = flash_lock((void )flash_addr, length, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1123 diag_printf("Error locking at %p: %s\n", err_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1124 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1125 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1126
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1127 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1128 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	1129 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1130 char *name;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1131 int stat;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1132 unsigned long length;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1133 CYG_ADDRESS flash_addr;
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1134 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1135 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1136 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1137 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1138
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1139 init_opts(&opts[0], 'f', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1140 (void *)&flash_addr, (bool )&flash_addr_set, "FLASH memory base address");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1141 init_opts(&opts[1], 'l', true, OPTION_ARG_TYPE_NUM,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1142 (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	1143 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	1144 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1145 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1146 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1147 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1148
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1149 if (name) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1150 struct fis_image_desc *img;
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1151 memcpy(fis_work_block, fis_addr, fisdir_size);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1152 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	1153 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	1154 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1155 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1156
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1157 flash_addr = img->flash_base;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1158 length = img->size;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1159 } 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	1160 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1161 return;
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 (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1164 ((stat = flash_verify_addr((void *)flash_addr)) \|\|
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1165 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1166 _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	1167 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1168 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1169
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1170 if ((stat = flash_unlock((void )flash_addr, length, (void *)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1171 diag_printf("Error unlocking at %p: %s\n", err_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1172 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1173 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1174 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1175
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1176 // This is set non-zero if the FLASH subsystem has successfully been initialized
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1177 static int __flash_init = 0;
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1178
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1179 void
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1180 _flash_info(void)
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1181 {
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1182 if (!__flash_init) return;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1183 diag_printf("FLASH: %p - %p, %d blocks of %p bytes each.\n",
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1184 flash_start, (CYG_ADDRWORD)flash_end + 1, flash_num_blocks, (void *)flash_block_size);
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1185 }
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1186
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1187 static bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1188 do_flash_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1189 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1190 int stat;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1191
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1192 if (!__flash_init) {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	1193 if ((stat = flash_init((void *)(workspace_end-FLASH_MIN_WORKSPACE),
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1194 FLASH_MIN_WORKSPACE, diag_printf)) != 0) {
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1195 diag_printf("FLASH: driver init failed: %s\n", flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1196 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1197 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1198 flash_get_limits((void )0, (void )&flash_start, (void *)&flash_end);
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1199 // Keep 'end' address as last valid location, to avoid wrap around problems
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1200 flash_end = (void *)((CYG_ADDRESS)flash_end - 1);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1201 flash_get_block_info(&flash_block_size, &flash_num_blocks);
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1202 workspace_end = (unsigned char *)(workspace_end-FLASH_MIN_WORKSPACE);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1203 #ifdef CYGOPT_REDBOOT_FIS
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1204 # ifdef CYGOPT_REDBOOT_FIS_ZLIB_COMMON_BUFFER
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1205 fis_work_block = fis_zlib_common_buffer;
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1206 if(CYGNUM_REDBOOT_FIS_ZLIB_COMMON_BUFFER_SIZE < flash_block_size) {
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1207 diag_printf("FLASH: common buffer too small\n");
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1208 workspace_end += FLASH_MIN_WORKSPACE;
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1209 return false;
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1210 }
906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1211 # else
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1212 workspace_end = (unsigned char *)(workspace_end-flash_block_size);
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1213 fis_work_block = workspace_end;
307 906a5d289c6d Better memory use vis FIS & ZLIB - from Thomas Koeller gthomas parents: 284 diff changeset	1214 # endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1215 fisdir_size = flash_block_size;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1216 if (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK < 0) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1217 fis_addr = (void *)((CYG_ADDRESS)flash_end + 1 +
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1218 (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK*flash_block_size));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1219 } else {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1220 fis_addr = (void *)((CYG_ADDRESS)flash_start +
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1221 (CYGNUM_REDBOOT_FIS_DIRECTORY_BLOCK*flash_block_size));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1222 }
791 a2dfa8bf3c57 Export RedBoot FIS functions - from Knud Woehler <knud.woehler@microplex.de> gthomas parents: 388 diff changeset	1223 memcpy(fis_work_block, fis_addr, flash_block_size);
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1224 #endif
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1225 __flash_init = 1;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1226 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1227 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1228 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1229
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1230 // Wrapper to avoid compiler warnings
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1231 static void
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1232 _do_flash_init(void)
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1233 {
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1234 do_flash_init();
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1235 }
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1236
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1237 #ifndef CYGOPT_REDBOOT_FLASH_CONFIG
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	1238 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	1239 #endif
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1240
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1241 static void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1242 do_fis(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1243 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1244 struct cmd *cmd;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1245
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1246 if (argc < 2) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1247 fis_usage("too few arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1248 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1249 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1250 if (!do_flash_init()) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1251 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	1252 return;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1253 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1254 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	1255 argv[1])) != (struct cmd *)0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1256 (cmd->fun)(argc, argv);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1257 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1258 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1259 fis_usage("unrecognized command");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1260 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1261
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1262 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1263
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1264 static bool config_ok;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1265
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1266 #define CONFIG_KEY1 0x0BADFACE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1267 #define CONFIG_KEY2 0xDEADDEAD
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1268
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1269 #define CONFIG_DONE 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1270 #define CONFIG_ABORT -1
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1271 #define CONFIG_CHANGED 1
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1272 #define CONFIG_OK 2
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1273 #define CONFIG_BACK 3
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1274 #define CONFIG_BAD 4
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1275
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1276 // Note: the following options are related. If 'boot_script' is false, then
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1277 // the other values are used in the configuration. Because of the way
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1278 // that configuration tables are generated, they should have names which
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1279 // are related. The configuration options will show up lexicographically
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1280 // ordered, thus the peculiar naming.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1281 RedBoot_config_option("Run script at boot",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1282 boot_script,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1283 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1284 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1285 false
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1286 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1287 RedBoot_config_option("Boot script",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1288 boot_script_data,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1289 "boot_script", true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1290 CONFIG_SCRIPT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1291 ""
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1292 );
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1293 // Some preprocessor magic for building the [constant] prompt string
152 f935b880e96c Merge from eCos master repository on 2001-02-14-01:27:14-GMT jlarmour parents: 151 diff changeset	1294 #define __cat(s1,c2,s3) s1 #c2 s3
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1295 #define _cat(s1,c2,s3) __cat(s1,c2,s3)
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1296 RedBoot_config_option(_cat("Boot script timeout (",
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1297 CYGNUM_REDBOOT_BOOT_SCRIPT_TIMEOUT_RESOLUTION,
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1298 "ms resolution)"),
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1299 boot_script_timeout,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1300 "boot_script", true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1301 CONFIG_INT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1302 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1303 );
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1304 #undef __cat
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1305 #undef _cat
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1306
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1307 #ifdef CYGSEM_REDBOOT_VARIABLE_BAUD_RATE
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1308 RedBoot_config_option("Console baud rate",
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1309 console_baud_rate,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1310 ALWAYS_ENABLED, true,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1311 CONFIG_INT,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1312 CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1313 );
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1314 #endif
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1315
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1316 CYG_HAL_TABLE_BEGIN( __CONFIG_options_TAB__, RedBoot_config_options);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1317 CYG_HAL_TABLE_END( __CONFIG_options_TAB_END__, RedBoot_config_options);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1318
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1319 extern struct config_option __CONFIG_options_TAB__[], __CONFIG_options_TAB_END__[];
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1320
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1321 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1322 // Layout of config data
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1323 // Each data item is variable length, with the name, type and dependencies
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1324 // encoded into the object.
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1325 // offset contents
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1326 // 0 data type
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1327 // 1 length of name (N)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1328 // 2 enable sense
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1329 // 3 length of enable key (M)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1330 // 4 key name
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1331 // N+4 enable key
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1332 // M+N+4 data value
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1333 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1334
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1335 #define CONFIG_OBJECT_TYPE(dp) (dp)[0]
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1336 #define CONFIG_OBJECT_KEYLEN(dp) (dp)[1]
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1337 #define CONFIG_OBJECT_ENABLE_SENSE(dp) (dp)[2]
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1338 #define CONFIG_OBJECT_ENABLE_KEYLEN(dp) (dp)[3]
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1339 #define CONFIG_OBJECT_KEY(dp) ((dp)+4)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1340 #define CONFIG_OBJECT_ENABLE_KEY(dp) ((dp)+4+CONFIG_OBJECT_KEYLEN(dp))
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1341 #define CONFIG_OBJECT_VALUE(dp) ((dp)+4+CONFIG_OBJECT_KEYLEN(dp)+CONFIG_OBJECT_ENABLE_KEYLEN(dp))
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1342
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1343 #define LIST_OPT_LIST_ONLY (1)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1344 #define LIST_OPT_NICKNAMES (2)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1345 #define LIST_OPT_FULLNAMES (4)
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1346 #define LIST_OPT_DUMBTERM (8)
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1347
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1348 static void config_init(void);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1349
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1350 static int
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1351 get_config(unsigned char dp, char title, int list_opt, char *newvalue )
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1352 {
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1353 char line[256], hold_line[256], sp, lp;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1354 int ret;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1355 bool hold_bool_val, new_bool_val, enable;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1356 unsigned long hold_int_val, new_int_val;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1357 #ifdef CYGPKG_REDBOOT_NETWORKING
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1358 in_addr_t hold_ip_val, new_ip_val;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1359 enet_addr_t hold_esa_val;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1360 int esa_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1361 char *esp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1362 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1363 void *val_ptr;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1364 int type;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1365
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1366 if (CONFIG_OBJECT_ENABLE_KEYLEN(dp)) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1367 flash_get_config(CONFIG_OBJECT_ENABLE_KEY(dp), &enable, CONFIG_BOOL);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1368 if (((bool)CONFIG_OBJECT_ENABLE_SENSE(dp) && !enable) \|\|
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1369 (!(bool)CONFIG_OBJECT_ENABLE_SENSE(dp) && enable)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1370 return CONFIG_OK; // Disabled field
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1371 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1372 }
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1373 lp = line; *lp = '\0';
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1374 val_ptr = (void *)CONFIG_OBJECT_VALUE(dp);
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1375 if (LIST_OPT_NICKNAMES & list_opt)
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1376 diag_printf("%s: ", CONFIG_OBJECT_KEY(dp));
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1377 if (LIST_OPT_FULLNAMES & list_opt) {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1378 if (title != (char *)NULL) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1379 diag_printf("%s: ", title);
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1380 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1381 diag_printf("%s: ", CONFIG_OBJECT_KEY(dp));
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1382 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1383 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1384 switch (type = CONFIG_OBJECT_TYPE(dp)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1385 case CONFIG_BOOL:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1386 memcpy(&hold_bool_val, val_ptr, sizeof(bool));
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1387 lp += diag_sprintf(lp, "%s", hold_bool_val ? "true" : "false");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1388 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1389 case CONFIG_INT:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1390 memcpy(&hold_int_val, val_ptr, sizeof(unsigned long));
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1391 lp += diag_sprintf(lp, "%ld", hold_int_val);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1392 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1393 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1394 case CONFIG_IP:
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1395 lp += diag_sprintf(lp, "%s", inet_ntoa((in_addr_t *)val_ptr));
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1396 if (0 == strcmp("0.0.0.0", line) && !(LIST_OPT_LIST_ONLY & list_opt)) {
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1397 // then we have a deeply unhelpful starting text - kill it off
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1398 // (unless we are just listing all values)
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1399 lp = line; *lp = '\0';
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1400 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1401 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1402 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1403 for (esa_ptr = 0; esa_ptr < sizeof(enet_addr_t); esa_ptr++) {
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1404 lp += diag_sprintf(lp, "0x%02X", ((unsigned char *)val_ptr)[esa_ptr]);
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1405 if (esa_ptr < (sizeof(enet_addr_t)-1)) lp += diag_sprintf(lp, ":");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1406 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1407 break;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1408 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1409 case CONFIG_NETPORT:
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1410 lp += diag_sprintf(lp, "%s", (unsigned char *)val_ptr);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1411 break;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1412 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1413 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1414 case CONFIG_STRING:
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1415 lp += diag_sprintf(lp, "%s", (unsigned char *)val_ptr);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1416 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1417 case CONFIG_SCRIPT:
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1418 diag_printf("\n");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1419 sp = lp = (unsigned char *)val_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1420 while (*sp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1421 while (*lp != '\n') lp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1422 *lp = '\0';
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1423 diag_printf(".. %s\n", sp);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1424 *lp++ = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1425 sp = lp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1426 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1427 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1428 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1429 if (LIST_OPT_LIST_ONLY & list_opt) {
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1430 diag_printf("%s\n", line);
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1431 return CONFIG_OK;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1432 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1433 if (type != CONFIG_SCRIPT) {
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1434 if (NULL != newvalue) {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1435 ret = strlen(newvalue);
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1436 if (ret > sizeof(line))
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1437 return CONFIG_BAD;
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1438 strcpy(hold_line, line); // Hold the old value for comparison
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1439 strcpy(line, newvalue);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1440 diag_printf("Setting to %s\n", newvalue);
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1441 } else {
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1442 // read from terminal
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1443 strcpy(hold_line, line);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1444 if (LIST_OPT_DUMBTERM & list_opt) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1445 diag_printf( (CONFIG_STRING == type ?
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1446 "%s > " :
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1447 "%s ? " ), line);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1448 *line = '\0';
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1449 }
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1450 ret = _rb_gets_preloaded(line, sizeof(line), 0);
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1451 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1452 if (ret < 0) return CONFIG_ABORT;
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1453 // empty input - leave value untouched (else DNS goes away for a
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1454 // minute to try to look it up) but we must accept empty value for strings.
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1455 if (0 == line[0] && CONFIG_STRING != type) return CONFIG_OK;
195 67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1456 if (strcmp(line, hold_line) == 0) return CONFIG_OK; // Just a CR - leave value untouched
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1457 lp = &line[strlen(line)-1];
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1458 if (*lp == '.') return CONFIG_DONE;
67850532eebb Merge from eCos master repository on 2001-11-02-06:43:03-GMT jlarmour parents: 191 diff changeset	1459 if (*lp == '^') return CONFIG_BACK;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1460 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1461 switch (type) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1462 case CONFIG_BOOL:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1463 memcpy(&hold_bool_val, val_ptr, sizeof(bool));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1464 if (!parse_bool(line, &new_bool_val)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1465 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1466 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1467 if (hold_bool_val != new_bool_val) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1468 memcpy(val_ptr, &new_bool_val, sizeof(bool));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1469 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1470 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1471 return CONFIG_OK;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1472 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1473 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1474 case CONFIG_INT:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1475 memcpy(&hold_int_val, val_ptr, sizeof(unsigned long));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1476 if (!parse_num(line, &new_int_val, 0, 0)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1477 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1478 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1479 if (hold_int_val != new_int_val) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1480 memcpy(val_ptr, &new_int_val, sizeof(unsigned long));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1481 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1482 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1483 return CONFIG_OK;
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 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1486 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1487 case CONFIG_IP:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1488 memcpy(&hold_ip_val.s_addr, &((in_addr_t *)val_ptr)->s_addr, sizeof(in_addr_t));
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1489 if (!_gethostbyname(line, &new_ip_val)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1490 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1491 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1492 if (hold_ip_val.s_addr != new_ip_val.s_addr) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1493 memcpy(val_ptr, &new_ip_val, sizeof(in_addr_t));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1494 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1495 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1496 return CONFIG_OK;
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 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1499 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1500 memcpy(&hold_esa_val, val_ptr, sizeof(enet_addr_t));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1501 esp = line;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1502 for (esa_ptr = 0; esa_ptr < sizeof(enet_addr_t); esa_ptr++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1503 unsigned long esa_byte;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1504 if (!parse_num(esp, &esa_byte, &esp, ":")) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1505 memcpy(val_ptr, &hold_esa_val, sizeof(enet_addr_t));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1506 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1507 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1508 ((unsigned char *)val_ptr)[esa_ptr] = esa_byte;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1509 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1510 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1511 break;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1512 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1513 case CONFIG_NETPORT:
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1514 if (strlen(line) >= MAX_STRING_LENGTH \|\| net_devindex(line) < 0) {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1515 int index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1516 const char *name;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1517 diag_printf("Sorry, Port name must be one of:\n");
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1518 for (index = 0; name = net_devname(index); index++)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1519 diag_printf(" %s\n", name);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1520 return CONFIG_BAD;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1521 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1522 strcpy((unsigned char *)val_ptr, line);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1523 break;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1524 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1525 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1526 case CONFIG_SCRIPT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1527 // Assume it always changes
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1528 sp = (unsigned char *)val_ptr;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1529 diag_printf("Enter script, terminate with empty line\n");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1530 while (true) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1531 *sp = '\0';
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1532 diag_printf(">> ");
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1533 ret = _rb_gets(line, sizeof(line), 0);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1534 if (ret < 0) return CONFIG_ABORT;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1535 if (strlen(line) == 0) break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1536 lp = line;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1537 while (*lp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1538 sp++ = lp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1539 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1540 *sp++ = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1541 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1542 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1543 case CONFIG_STRING:
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1544 if (strlen(line) >= MAX_STRING_LENGTH) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1545 diag_printf("Sorry, value is too long\n");
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1546 return CONFIG_BAD;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1547 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1548 strcpy((unsigned char *)val_ptr, line);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1549 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1550 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1551 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1552 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1553
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1554 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1555 // Manage configuration information with the FLASH
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1556 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1557
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1558 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1559 config_length(int type)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1560 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1561 switch (type) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1562 case CONFIG_BOOL:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1563 return sizeof(bool);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1564 case CONFIG_INT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1565 return sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1566 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1567 case CONFIG_IP:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1568 return sizeof(in_addr_t);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1569 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1570 // Would like this to be sizeof(enet_addr_t), but that causes much
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1571 // pain since it fouls the alignment of data which follows.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1572 return 8;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1573 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1574 case CONFIG_NETPORT:
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1575 return MAX_STRING_LENGTH;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1576 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1577 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1578 case CONFIG_STRING:
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1579 return MAX_STRING_LENGTH;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1580 case CONFIG_SCRIPT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1581 return MAX_SCRIPT_LENGTH;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1582 default:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1583 return 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1584 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1585 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1586
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1587 static cmd_fun do_flash_config;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1588 RedBoot_cmd("fconfig",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1589 "Manage configuration kept in FLASH memory",
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1590 "[-i] [-l] [-n] [-f] [-d] \| [-d] nickname [value]",
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1591 do_flash_config
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1592 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1593
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1594 static void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1595 do_flash_config(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1596 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1597 bool need_update = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1598 struct config_option *optend = __CONFIG_options_TAB_END__;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1599 struct config_option *opt = __CONFIG_options_TAB__;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1600 struct option_info opts[5];
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1601 bool list_only;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1602 bool nicknames;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1603 bool fullnames;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1604 bool dumbterminal;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1605 int list_opt = 0;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1606 unsigned char *dp;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1607 int len, ret;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1608 char *title;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1609 char *onlyone = NULL;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1610 char *onevalue = NULL;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1611 bool doneone = false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1612 bool init = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1613
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1614 if (!__flash_init) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1615 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	1616 return;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1617 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1618 memcpy(backup_config, config, sizeof(struct _config));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1619 script = (unsigned char *)0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1620
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1621 init_opts(&opts[0], 'l', false, OPTION_ARG_TYPE_FLG,
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1622 (void *)&list_only, (bool )0, "list configuration only");
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1623 init_opts(&opts[1], 'n', false, OPTION_ARG_TYPE_FLG,
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1624 (void *)&nicknames, (bool )0, "show nicknames");
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1625 init_opts(&opts[2], 'f', false, OPTION_ARG_TYPE_FLG,
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1626 (void *)&fullnames, (bool )0, "show full names");
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1627 init_opts(&opts[3], 'i', false, OPTION_ARG_TYPE_FLG,
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1628 (void *)&init, (bool )0, "initialize configuration database");
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1629 init_opts(&opts[4], 'd', false, OPTION_ARG_TYPE_FLG,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1630 (void *)&dumbterminal, (bool )0, "dumb terminal: no clever edits");
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1631
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1632 // First look to see if we are setting or getting a single option
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1633 // by just quoting its nickname
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1634 if ( (2 == argc && '-' != argv[1][0]) \|\|
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1635 (3 == argc && '-' != argv[1][0] && '-' != argv[2][0])) {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1636 // then the command was "fconfig foo [value]"
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1637 onlyone = argv[1];
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1638 onevalue = (3 == argc) ? argv[2] : NULL;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1639 list_opt = LIST_OPT_NICKNAMES;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1640 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1641 // Next see if we are setting or getting a single option with a dumb
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1642 // terminal invoked, ie. no line editing.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1643 else if (3 == argc &&
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1644 '-' == argv[1][0] && 'd' == argv[1][1] && 0 == argv[1][2] &&
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1645 '-' != argv[2][0]) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1646 // then the command was "fconfig -d foo"
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1647 onlyone = argv[2];
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1648 onevalue = NULL;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1649 list_opt = LIST_OPT_NICKNAMES \| LIST_OPT_DUMBTERM;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1650 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1651 else {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1652 if (!scan_opts(argc, argv, 1, opts, 5, 0, 0, ""))
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1653 return;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1654 list_opt \|= list_only ? LIST_OPT_LIST_ONLY : 0;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1655 list_opt \|= nicknames ? LIST_OPT_NICKNAMES : LIST_OPT_FULLNAMES;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1656 list_opt \|= fullnames ? LIST_OPT_FULLNAMES : 0;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1657 list_opt \|= dumbterminal ? LIST_OPT_DUMBTERM : 0;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1658 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1659
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1660 if (init && verify_action("Initialize non-volatile configuration")) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1661 config_init();
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1662 need_update = true;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1663 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1664
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1665 dp = &config->config_data[0];
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1666 while (dp < &config->config_data[sizeof(config->config_data)]) {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1667 if (CONFIG_OBJECT_TYPE(dp) == CONFIG_EMPTY) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1668 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1669 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1670 len = 4 + CONFIG_OBJECT_KEYLEN(dp) + CONFIG_OBJECT_ENABLE_KEYLEN(dp) +
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1671 config_length(CONFIG_OBJECT_TYPE(dp));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1672 // Provide a title for well known [i.e. builtin] objects
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1673 title = (char *)NULL;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1674 opt = __CONFIG_options_TAB__;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1675 while (opt != optend) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1676 if (strcmp(opt->key, CONFIG_OBJECT_KEY(dp)) == 0) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1677 title = opt->title;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1678 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1679 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1680 opt++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1681 }
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1682 if ( onlyone && 0 != strcmp(CONFIG_OBJECT_KEY(dp), onlyone) )
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1683 ret = CONFIG_OK; // skip this entry
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1684 else {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1685 doneone = true;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1686 ret = get_config(dp, title, list_opt, onevalue); // do this opt
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1687 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1688 switch (ret) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1689 case CONFIG_DONE:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1690 goto done;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1691 case CONFIG_ABORT:
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1692 memcpy(config, backup_config, sizeof(struct _config));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1693 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1694 case CONFIG_CHANGED:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1695 need_update = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1696 case CONFIG_OK:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1697 dp += len;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1698 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1699 case CONFIG_BACK:
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1700 dp = &config->config_data[0];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1701 continue;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1702 case CONFIG_BAD:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1703 // Nothing - make him do it again
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1704 diag_printf ("** invalid entry\n");
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 196 diff changeset	1705 onevalue = NULL; // request a good value be typed in - or abort/whatever
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1706 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1707 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1708
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1709 done:
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1710 if (NULL != onlyone && !doneone) {
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1711 #ifdef CYGSEM_REDBOOT_ALLOW_DYNAMIC_FLASH_CONFIG_DATA
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1712 if (verify_action("** entry '%s' not found - add", onlyone)) {
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1713 struct config_option opt;
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1714 diag_printf("Trying to add value\n");
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1715 }
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1716 #else
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1717 diag_printf("** entry '%s' not found", onlyone);
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1718 #endif
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1719 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1720 if (!need_update)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1721 return;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1722 flash_write_config();
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1723 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1724
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1725
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1726 #ifdef CYGSEM_REDBOOT_FLASH_ALIASES
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1727 static cmd_fun do_alias;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1728 RedBoot_cmd("alias",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1729 "Manage aliases kept in FLASH memory",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1730 "name [value]",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1731 do_alias
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1732 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1733
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1734 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1735 make_alias(char alias, char name)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1736 {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1737 diag_sprintf(alias, "alias/%s", name);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1738 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1739
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1740 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1741 do_alias(int argc, char *argv[])
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1742 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1743 char name[80];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1744 char *val;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1745 struct config_option opt;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1746
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1747 switch (argc) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1748 case 2:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1749 make_alias(name, argv[1]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1750 if (flash_get_config(name, &val, CONFIG_STRING)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1751 diag_printf("'%s' = '%s'\n", argv[1], val);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1752 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1753 diag_printf("'%s' not found\n", argv[1]);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1754 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1755 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1756 case 3:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1757 if (strlen(argv[2]) >= MAX_STRING_LENGTH) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1758 diag_printf("Sorry, value is too long\n");
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1759 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1760 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1761 make_alias(name, argv[1]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1762 opt.type = CONFIG_STRING;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1763 opt.enable = (char *)0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1764 opt.enable_sense = 1;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1765 opt.key = name;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1766 opt.dflt = (CYG_ADDRESS)argv[2];
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1767 flash_add_config(&opt, true);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1768 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1769 default:
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1770 diag_printf("usage: alias name [value]\n");
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1771 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1772 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1773
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1774 // Lookup an alias. First try plain string aliases. If that fails try
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1775 // other types so allowing access to all configured values. This allows
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1776 // for alias (macro) expansion of normal 'fconfig' data, such as the
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1777 // board IP address.
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1778 char *
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1779 flash_lookup_alias(char alias, char alias_buf)
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1780 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1781 char name[80];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1782 char *val;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1783 unsigned char * dp;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1784 void *val_ptr;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1785 int type;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1786 bool hold_bool_val;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1787 long hold_long_val;
202 353a011b23b8 Merge from eCos master repository on 2002-01-11-06:43:03-GMT jlarmour parents: 198 diff changeset	1788 #ifdef CYGPKG_REDBOOT_NETWORKING
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1789 int esa_ptr;
202 353a011b23b8 Merge from eCos master repository on 2002-01-11-06:43:03-GMT jlarmour parents: 198 diff changeset	1790 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1791
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1792 make_alias(name, alias);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1793 if (flash_get_config(name, &val, CONFIG_STRING)) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1794 return val;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1795 } else {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1796 dp = flash_lookup_config(alias);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1797 if (dp) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1798 val_ptr = (void *)CONFIG_OBJECT_VALUE(dp);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1799 switch (type = CONFIG_OBJECT_TYPE(dp)) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1800 case CONFIG_BOOL:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1801 memcpy(&hold_bool_val, val_ptr, sizeof(bool));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1802 diag_sprintf(alias_buf, "%s", hold_bool_val ? "true" : "false");
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1803 break;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1804 case CONFIG_INT:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1805 memcpy(&hold_long_val, val_ptr, sizeof(unsigned long));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1806 diag_sprintf(alias_buf,"%ld", hold_long_val);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1807 break;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1808 #ifdef CYGPKG_REDBOOT_NETWORKING
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1809 case CONFIG_IP:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1810 diag_sprintf(alias_buf,"%s", inet_ntoa((in_addr_t *)val_ptr));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1811 break;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1812 case CONFIG_ESA:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1813 for (esa_ptr = 0; esa_ptr < sizeof(enet_addr_t); esa_ptr++) {
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1814 diag_sprintf(alias_buf+(3esa_ptr), "0x%02X", ((unsigned char )val_ptr)[esa_ptr]);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1815 if (esa_ptr < (sizeof(enet_addr_t)-1)) diag_printf(":");
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1816 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1817 break;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1818 #endif
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1819 case CONFIG_SCRIPT:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1820 return (char *) val_ptr;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1821 break;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1822 default:
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1823 return (char *)NULL;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1824 }
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1825 return alias_buf;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1826 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1827 return (char *)NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1828 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1829 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1830
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1831 #endif // CYGSEM_REDBOOT_FLASH_ALIASES
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1832
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1833 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1834 // Write the in-memory copy of the configuration data to the flash device.
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1835 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1836 void
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1837 flash_write_config(void)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1838 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1839 #ifndef CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1840 int stat;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1841 void *err_addr;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1842 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1843
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1844 config->len = sizeof(struct _config);
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1845 config->key1 = CONFIG_KEY1;
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1846 config->key2 = CONFIG_KEY2;
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	1847 config->cksum = cyg_crc32((unsigned char *)config, sizeof(struct _config)-sizeof(config->cksum));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1848 if (verify_action("Update RedBoot non-volatile configuration")) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1849 #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	1850 memcpy(fis_work_block, fis_addr, fisdir_size);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1851 fis_update_directory();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1852 #else // CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1853 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1854 // Insure [quietly] that the config page is unlocked before trying to update
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1855 flash_unlock((void )cfg_base, cfg_size, (void *)&err_addr);
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1856 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1857 if ((stat = flash_erase(cfg_base, cfg_size, (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1858 diag_printf(" initialization failed at %p: %s\n", err_addr, flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1859 } else {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1860 if ((stat = flash_program(cfg_base, (void *)config, sizeof(struct _config),
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1861 (void **)&err_addr)) != 0) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1862 diag_printf("Error writing config data at %p: %s\n",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1863 err_addr, flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1864 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1865 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1866 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1867 // Insure [quietly] that the config data is locked after the update
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1868 flash_lock((void )cfg_base, cfg_size, (void *)&err_addr);
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1869 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1870 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1871 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1872 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1873
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1874 //
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1875 // Find the configuration entry for a particular key
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1876 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1877 static unsigned char *
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1878 flash_lookup_config(char *key)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1879 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1880 unsigned char *dp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1881 int len;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1882
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1883 if (!config_ok) return (unsigned char *)NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1884
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1885 dp = &config->config_data[0];
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	1886 while (dp < &config->config_data[sizeof(config->config_data)]) {
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1887 len = 4 + CONFIG_OBJECT_KEYLEN(dp) + CONFIG_OBJECT_ENABLE_KEYLEN(dp) +
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1888 config_length(CONFIG_OBJECT_TYPE(dp));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1889 if (strcmp(key, CONFIG_OBJECT_KEY(dp)) == 0) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1890 return dp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1891 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1892 dp += len;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1893 }
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1894 // diag_printf("Can't find config data for '%s'\n", key);
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1895 return false;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1896 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1897
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1898 //
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1899 // Retrieve a data object from the data base (in memory copy)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1900 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1901 bool
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1902 flash_get_config(char key, void val, int type)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1903 {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1904 unsigned char *dp;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1905 void *val_ptr;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1906 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG_READONLY_FALLBACK
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1907 struct _config *save_config = 0;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1908 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1909
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1910 if (!config_ok) return false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1911
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1912 if ((dp = flash_lookup_config(key)) != (unsigned char *)NULL) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1913 if (CONFIG_OBJECT_TYPE(dp) == type) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1914 val_ptr = (void *)CONFIG_OBJECT_VALUE(dp);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1915 switch (type) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1916 // Note: the data may be unaligned in the configuration data
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1917 case CONFIG_BOOL:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1918 memcpy(val, val_ptr, sizeof(bool));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1919 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1920 case CONFIG_INT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1921 memcpy(val, val_ptr, sizeof(unsigned long));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1922 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1923 #ifdef CYGPKG_REDBOOT_NETWORKING
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1924 case CONFIG_IP:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1925 memcpy(val, val_ptr, sizeof(in_addr_t));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1926 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1927 case CONFIG_ESA:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1928 memcpy(val, val_ptr, sizeof(enet_addr_t));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1929 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1930 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1931 case CONFIG_STRING:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1932 case CONFIG_SCRIPT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1933 // Just return a pointer to the script/line
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1934 (unsigned char )val = (unsigned char )val_ptr;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1935 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1936 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1937 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	1938 diag_printf("Request for config value '%s' - wrong type\n", key);
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1939 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1940 return true;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1941 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1942 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG_READONLY_FALLBACK
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1943 // Did not find key. Is configuration data valid?
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1944 // Check to see if the config data is valid, if not, revert to
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1945 // readonly mode, by setting config to readonly_config. We
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1946 // will set it back before we leave this function.
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	1947 if ( (config != readonly_config) && ((cyg_crc32((unsigned char *)config,
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1948 sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) \|\|
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1949 (config->key1 != CONFIG_KEY1)\|\| (config->key2 != CONFIG_KEY2))) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1950 save_config = config;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1951 config = readonly_config;
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	1952 if ((cyg_crc32((unsigned char *)config,
3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	1953 sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) \|\|
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1954 (config->key1 != CONFIG_KEY1)\|\| (config->key2 != CONFIG_KEY2)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1955 diag_printf("FLASH configuration checksum error or invalid key\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1956 config = save_config;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1957 return false;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1958 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1959 else{
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1960 diag_printf("Getting config information in READONLY mode\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1961 return flash_get_config(key, val, type);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1962 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1963 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	1964 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1965 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1966 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1967
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1968 //
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1969 // Copy data into the config area
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1970 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1971 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1972 flash_config_insert_value(unsigned char dp, struct config_option opt)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1973 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1974 switch (opt->type) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1975 // Note: the data may be unaligned in the configuration data
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1976 case CONFIG_BOOL:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1977 memcpy(dp, (void *)&opt->dflt, sizeof(bool));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1978 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1979 case CONFIG_INT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1980 memcpy(dp, (void *)&opt->dflt, sizeof(unsigned long));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1981 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1982 #ifdef CYGPKG_REDBOOT_NETWORKING
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1983 case CONFIG_IP:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1984 memcpy(dp, (void *)&opt->dflt, sizeof(in_addr_t));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1985 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1986 case CONFIG_ESA:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1987 memcpy(dp, (void *)&opt->dflt, sizeof(enet_addr_t));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1988 break;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1989 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1990 case CONFIG_NETPORT:
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1991 // validate dflt and if not acceptable use first port
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1992 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1993 int index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1994 const char *name;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1995 for (index = 0; (name = net_devname(index)) != NULL; index++)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1996 if (!strcmp((char *)opt->dflt, name))
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1997 break;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1998 if (name == NULL)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	1999 name = net_devname(0);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	2000 memcpy(dp, name, strlen(name) + 1);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	2001 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	2002 break;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 791 diff changeset	2003 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2004 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2005 case CONFIG_STRING:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2006 memcpy(dp, (void *)opt->dflt, config_length(CONFIG_STRING));
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2007 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2008 case CONFIG_SCRIPT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2009 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2010 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2011 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2012
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2013 //
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2014 // Add a new option to the database
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2015 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2016 bool
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2017 flash_add_config(struct config_option *opt, bool update)
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2018 {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2019 unsigned char dp, kp;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2020 int len, elen, size;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2021
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2022 // If data item is already present, just update it
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2023 // Note: only the data value can be thusly changed
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2024 if ((dp = flash_lookup_config(opt->key)) != (unsigned char *)NULL) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2025 flash_config_insert_value(CONFIG_OBJECT_VALUE(dp), opt);
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2026 if (update) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2027 flash_write_config();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2028 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2029 return true;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2030 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2031 // Add the data item
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2032 dp = &config->config_data[0];
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2033 size = 0;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2034 while (size < sizeof(config->config_data)) {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2035 if (CONFIG_OBJECT_TYPE(dp) == CONFIG_EMPTY) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2036 kp = opt->key;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2037 len = strlen(kp) + 1;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2038 size += len + 2 + 2 + config_length(opt->type);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2039 if (opt->enable) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2040 elen = strlen(opt->enable) + 1;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2041 size += elen;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2042 } else {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2043 elen = 0;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2044 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2045 if (size > sizeof(config->config_data)) {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2046 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2047 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2048 CONFIG_OBJECT_TYPE(dp) = opt->type;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2049 CONFIG_OBJECT_KEYLEN(dp) = len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2050 CONFIG_OBJECT_ENABLE_SENSE(dp) = opt->enable_sense;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2051 CONFIG_OBJECT_ENABLE_KEYLEN(dp) = elen;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2052 dp = CONFIG_OBJECT_KEY(dp);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2053 while (kp) dp++ += *kp++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2054 *dp++ = '\0';
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2055 if (elen) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2056 kp = opt->enable;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2057 while (kp) dp++ += *kp++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2058 *dp++ = '\0';
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2059 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	2060 flash_config_insert_value(dp, opt);
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2061 if (update) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2062 flash_write_config();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2063 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2064 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2065 } else {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2066 len = 4 + CONFIG_OBJECT_KEYLEN(dp) + CONFIG_OBJECT_ENABLE_KEYLEN(dp) +
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2067 config_length(CONFIG_OBJECT_TYPE(dp));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2068 dp += len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2069 size += len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2070 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2071 }
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	2072 diag_printf("No space to add '%s'\n", opt->key);
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2073 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2074 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2075
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2076 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2077 // Reset/initialize configuration data - used only when starting from scratch
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2078 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2079 static void
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2080 config_init(void)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2081 {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2082 // Well known option strings
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2083 struct config_option *optend = __CONFIG_options_TAB_END__;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2084 struct config_option *opt = __CONFIG_options_TAB__;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2085
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2086 memset(config, 0, sizeof(struct _config));
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2087 while (opt != optend) {
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	2088 if (!flash_add_config(opt, false)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2089 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2090 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2091 opt++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2092 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2093 config_ok = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2094 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2095
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2096 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2097 // Attempt to get configuration information from the FLASH.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2098 // If available (i.e. good checksum, etc), initialize "known"
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2099 // values for later use.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2100 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2101 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2102 load_flash_config(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2103 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2104 bool use_boot_script;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2105
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2106 config_ok = false;
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	2107 script = (unsigned char *)0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2108 if (!do_flash_init()) return;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2109 config = (struct _config *)(workspace_end-sizeof(struct _config));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2110 backup_config = (struct _config *)((CYG_ADDRESS)config-sizeof(struct _config));
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2111 workspace_end = (unsigned char *)backup_config;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2112 cfg_size = (flash_block_size > sizeof(struct _config)) ?
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2113 sizeof(struct _config) :
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2114 _rup(sizeof(struct _config), flash_block_size);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2115 #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	2116 cfg_size = _rup(cfg_size, sizeof(struct fis_image_desc));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2117 if ((flash_block_size-cfg_size) < 8*sizeof(struct fis_image_desc)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2118 // Too bad this can't be checked at compile/build time
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2119 diag_printf("Sorry, FLASH config exceeds available space in FIS directory\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2120 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2121 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2122 fisdir_size = flash_block_size - cfg_size;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2123 cfg_base = (void *)(((CYG_ADDRESS)fis_addr + flash_block_size) - cfg_size);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2124 #else
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	2125 if (CYGNUM_REDBOOT_FLASH_CONFIG_BLOCK < 0) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2126 cfg_base = (void *)((CYG_ADDRESS)flash_end + 1 -
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2127 _rup(_rup((-CYGNUM_REDBOOT_FLASH_CONFIG_BLOCK*flash_block_size), cfg_size), flash_block_size));
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	2128 } else {
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2129 cfg_base = (void *)((CYG_ADDRESS)flash_start +
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2130 _rup(_rup((CYGNUM_REDBOOT_FLASH_CONFIG_BLOCK*flash_block_size), cfg_size), flash_block_size));
183 9160a8005d76 Merge from eCos master repository on 2001-09-12-03:52:30-BST jlarmour parents: 182 diff changeset	2131 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2132 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2133 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG_READONLY_FALLBACK
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2134 readonly_config = cfg_base;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2135 #endif
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2136 memcpy(config, cfg_base, sizeof(struct _config));
284 3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	2137 if ((cyg_crc32((unsigned char *)config,
3e80ecaaa3f8 * src/crc.c: Removed. Replaced with the CRC package. asl parents: 280 diff changeset	2138 sizeof(struct _config)-sizeof(config->cksum)) != config->cksum) \|\|
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 183 diff changeset	2139 (config->key1 != CONFIG_KEY1)\|\| (config->key2 != CONFIG_KEY2)) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 179 diff changeset	2140 diag_printf("FLASH configuration checksum error or invalid key\n");
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	2141 config_init();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2142 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2143 }
153 5e8f3b328bb3 Merge from eCos master repository on 2001-02-19-15:48:12-GMT jlarmour parents: 152 diff changeset	2144 config_ok = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2145 flash_get_config("boot_script", &use_boot_script, CONFIG_BOOL);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2146 if (use_boot_script) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2147 flash_get_config("boot_script_data", &script, CONFIG_SCRIPT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2148 flash_get_config("boot_script_timeout", &script_timeout, CONFIG_INT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2149 }
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	2150 #ifdef CYGSEM_REDBOOT_VARIABLE_BAUD_RATE
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	2151 if (flash_get_config("console_baud_rate", &console_baud_rate, CONFIG_INT)) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 202 diff changeset	2152 extern int set_console_baud_rate(int);
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	2153 set_console_baud_rate(console_baud_rate);
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	2154 }
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	2155 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2156 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2157
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2158 RedBoot_init(load_flash_config, RedBoot_INIT_FIRST);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2159
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	2160 #endif // CYGSEM_REDBOOT_FLASH_CONFIG
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	2161
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	2162 // EOF flash.c

Mercurial > flash_v2

annotate packages/redboot/current/src/flash.c @ 962:0138b3d6b8a0