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

annotate packages/redboot/current/src/flash.c @ 177:4c750ce71ae3

Merge from eCos master repository on 2001-08-10-19:22:57-BST

author	jlarmour
date	Fri, 10 Aug 2001 19:27:55 +0000
parents	38892b97b685
children	391299f9e541

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 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	8 //####COPYRIGHTBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	9 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	10 // -------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	11 // The contents of this file are subject to the Red Hat eCos Public License
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	12 // Version 1.1 (the "License"); you may not use this file except in
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	13 // compliance with the License. You may obtain a copy of the License at
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	14 // http://www.redhat.com/
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	15 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	16 // Software distributed under the License is distributed on an "AS IS"
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	17 // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	18 // License for the specific language governing rights and limitations under
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	19 // the License.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	20 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	21 // The Original Code is eCos - Embedded Configurable Operating System,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	22 // released September 30, 1998.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	23 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	24 // The Initial Developer of the Original Code is Red Hat.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	25 // Portions created by Red Hat are
147 d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	26 // Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	27 // All Rights Reserved.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	28 // -------------------------------------------
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	29 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	30 //####COPYRIGHTEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	31 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	32 //#####DESCRIPTIONBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	33 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	34 // Author(s): gthomas
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	35 // Contributors: gthomas
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	36 // Date: 2000-07-28
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	37 // Purpose:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	38 // Description:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	39 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	40 // 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	41 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	42 //####DESCRIPTIONEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	43 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	44 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	45
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	46 #include <redboot.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	47 #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	48 #include <fis.h>
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	49
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	50 // CLI function
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	51 static cmd_fun do_fis;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	52 RedBoot_cmd("fis",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	53 "Manage FLASH images",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	54 "{cmds}",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	55 do_fis
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	56 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	57
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	58 #ifdef CYGOPT_REDBOOT_FIS
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	59 // Image management functions
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	60 local_cmd_entry("init",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	61 "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	62 "[-f]",
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	63 fis_init,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	64 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	65 );
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	66 #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	67 # 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	68 #else
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	69 # define FIS_LIST_OPTS "[-d]"
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	70 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	71 local_cmd_entry("list",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	72 "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	73 FIS_LIST_OPTS,
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	74 fis_list,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	75 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	76 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	77 local_cmd_entry("free",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	78 "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	79 "",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	80 fis_free,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	81 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	82 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	83 local_cmd_entry("delete",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	84 "Display an image from FLASH Image System [FIS]",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	85 "name",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	86 fis_delete,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	87 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	88 );
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	89
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	90 static char fis_load_usage[] =
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	91 #ifdef CYGPKG_COMPRESS_ZLIB
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	92 "[-d] "
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	93 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	94 "[-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	95
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	96 local_cmd_entry("load",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	97 "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	98 fis_load_usage,
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	99 fis_load,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	100 FIS_cmds
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	101 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	102 local_cmd_entry("create",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	103 "Create an image",
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	104 "-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	105 " [-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	106 fis_create,
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 );
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	109 #endif
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	110
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	111 // Raw flash access functions
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	112 local_cmd_entry("erase",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	113 "Erase FLASH contents",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	114 "-f <flash_addr> -l <length>",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	115 fis_erase,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	116 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	117 );
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	118 #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	119 local_cmd_entry("lock",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	120 "LOCK FLASH contents",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	121 "-f <flash_addr> -l <length>",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	122 fis_lock,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	123 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	124 );
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	125 local_cmd_entry("unlock",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	126 "UNLOCK FLASH contents",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	127 "-f <flash_addr> -l <length>",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	128 fis_unlock,
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	129 FIS_cmds
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	130 );
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	131 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	132 local_cmd_entry("write",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	133 "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	134 "-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	135 fis_write,
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	136 FIS_cmds
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	137 );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	138
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	139 // Define table boundaries
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	140 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	141 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	142
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	143 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	144
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	145 // Local data used by these routines
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	146 static void flash_start, flash_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	147 static int block_size, blocks;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	148 static void *fis_work_block;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	149 static int fisdir_size; // Size of FIS directory. Note: zero if FIS not enabled
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	150 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	151 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	152 static int cfg_size; // Length of config data - rounded to Flash block size
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	153 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	154
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	155 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	156 fis_usage(char *why)
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	157 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	158 printf("*** invalid 'fis' command: %s\n", why);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	159 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	160 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	161
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	162 #ifdef CYGOPT_REDBOOT_FIS
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	163 struct fis_image_desc *
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	164 fis_lookup(char *name)
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	165 {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	166 int i;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	167 void *fis_addr;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	168 struct fis_image_desc *img;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	169
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	170 fis_addr = (void *)((unsigned long)flash_end - block_size);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	171 memcpy(fis_work_block, fis_addr, block_size);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	172 img = (struct fis_image_desc *)fis_work_block;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	173 for (i = 0; i < block_size/sizeof(*img); i++, img++) {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	174 if ((img->name[0] != (unsigned char)0xFF) && (strcmp(name, img->name) == 0)) {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	175 return img;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	176 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	177 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	178 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	179 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	180
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	181 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	182 fis_init(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	183 {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	184 int stat;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	185 struct fis_image_desc *img;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	186 void fis_base, err_addr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	187 bool full_init = false;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	188 struct option_info opts[1];
147 d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	189 unsigned long redboot_image_size, redboot_flash_start;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	190
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	191 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	192 (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	193 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	194 {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	195 return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	196 }
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	197
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	198 if (!verify_action("About to initialize [format] FLASH image system")) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	199 printf("** Aborted\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	200 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	201 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	202 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	203
d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	204 #define MIN_REDBOOT_IMAGE_SIZE CYGBLD_REDBOOT_MIN_IMAGE_SIZE
d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	205 redboot_image_size = block_size > MIN_REDBOOT_IMAGE_SIZE ? block_size : MIN_REDBOOT_IMAGE_SIZE;
d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	206
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	207 // 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	208 img = (struct fis_image_desc *)fis_work_block;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	209 #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	210 memset(img, 0, sizeof(*img));
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	211 strcpy(img->name, "(reserved)");
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	212 img->flash_base = (unsigned long)flash_start;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	213 img->mem_base = (unsigned long)flash_start;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	214 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	215 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	216 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	217 redboot_flash_start = (unsigned long)flash_start + CYGBLD_REDBOOT_FLASH_BOOT_OFFSET;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	218 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	219 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	220 strcpy(img->name, "RedBoot");
147 d397fc472bcf Merge from eCos master repository on 2001-01-05-06:43:02-GMT jlarmour parents: 145 diff changeset	221 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	222 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	223 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	224 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	225 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	226 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	227 #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	228 #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	229 // Take care to place the POST entry at the right offset:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	230 redboot_flash_start = (unsigned long)flash_start + 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	231 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	232 memset(img, 0, sizeof(*img));
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	233 strcpy(img->name, "RedBoot[post]");
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	234 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	235 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	236 img->size = redboot_image_size;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	237 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	238 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	239 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	240 #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	241 // And a backup image
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	242 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	243 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	244 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	245 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	246 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	247 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	248 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	249 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	250 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	251 // 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	252 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	253 strcpy(img->name, "RedBoot config");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	254 img->flash_base = (unsigned long)cfg_base;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	255 img->mem_base = (unsigned long)cfg_base;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	256 img->size = cfg_size;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	257 img++;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	258 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	259 // 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	260 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	261 strcpy(img->name, "FIS directory");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	262 fis_base = (void *)((unsigned long)flash_end - block_size);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	263 img->flash_base = (unsigned long)fis_base;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	264 img->mem_base = (unsigned long)fis_base;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	265 img->size = block_size;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	266 img++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	267
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	268 // 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	269 // 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	270
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	271 if (full_init) {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	272 unsigned long erase_start, erase_size;
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	273 // Erase everything except default RedBoot images, fis block, and config block.
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	274 // FIXME! This still assumes that fis and config blocks can use top of FLASH.
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	275
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	276 // first deal with the possible first part, before RedBoot images:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	277 erase_start = (unsigned long)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	278 erase_size = (unsigned long)flash_start + CYGBLD_REDBOOT_FLASH_BOOT_OFFSET;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	279 if ( erase_size > erase_start ) {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	280 erase_size -= erase_start;
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	281 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	282 (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	283 printf(" initialization failed at %p: %s\n",
4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	284 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	285 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	286 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	287 // 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	288 erase_start = redboot_flash_start; // high water of created images
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	289 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	290 erase_size = (unsigned long)cfg_base - erase_start; // the gap between HWM and config data
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	291 #else
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	292 erase_size = (unsigned long)fis_base - erase_start; // the gap between HWM and fis data
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	293 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	294 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	295 (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	296 printf(" initialization failed at %p: %s\n",
4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	297 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	298 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	299 } else {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	300 printf(" Warning: device contents not erased, some blocks may not be usable\n");
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	301 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	302
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	303 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	304 // Ensure [quietly] that the directory is unlocked before trying to update
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	305 flash_unlock((void )fis_base, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	306 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	307 if ((stat = flash_erase(fis_base, block_size, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	308 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	309 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	310 if ((stat = flash_program(fis_base, fis_work_block,
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	311 (unsigned long)img - (unsigned long)fis_work_block,
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	312 (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	313 printf("Error writing image descriptors at %p: %s\n",
4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	314 err_addr, flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	315 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	316 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	317 #ifdef CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	318 // Ensure [quietly] that the directory is locked after the update
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	319 flash_lock((void )fis_base, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	320 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	321 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	322
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	323 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	324 fis_list(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	325 {
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	326 struct fis_image_desc *img;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327 int i;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	328 bool show_cksums = false;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	329 bool show_datalen = false;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	330 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	331
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	332 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	333 (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	334 #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	335 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	336 (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	337 i = 2;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	338 #else
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	339 i = 1;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	340 #endif
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	341 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	342 {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	343 return;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	344 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	345
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	346 img = (struct fis_image_desc *)((unsigned long)flash_end - block_size);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	347 // Let printf do the formatting in both cases, rather than cnouting
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	348 // cols by hand....
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	349 printf("%-16s %-10s %-10s %-10s %-s\n",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	350 "Name","FLASH addr",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	351 show_cksums ? "Checksum" : "Mem addr",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	352 show_datalen ? "Datalen" : "Length",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	353 "Entry point" );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	354 for (i = 0; i < block_size/sizeof(*img); i++, img++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	355 if (img->name[0] != (unsigned char)0xFF) {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	356 printf("%-16s 0x%08lX 0x%08lX 0x%08lX 0x%08lX\n", img->name,
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	357 img->flash_base,
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	358 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	359 show_cksums ? img->file_cksum : img->mem_base,
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	360 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	361 #else
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	362 img->mem_base,
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	363 img->size,
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	364 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	365 img->entry_point);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	366 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	367 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	368 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	369
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	370 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	371 fis_free(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	372 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	373 unsigned long fis_ptr, fis_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	374 unsigned long *area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	375
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	376 // Do not search the area reserved for pre-RedBoot systems:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	377 fis_ptr = (unsigned long *)((unsigned long)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	378 fis_end = (unsigned long *)(unsigned long)flash_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	379 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	380 while (fis_ptr < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	381 if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	382 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	383 // Assume that this is something
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	384 printf(" 0x%08lX .. 0x%08lX\n",
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	385 (unsigned long)area_start, (unsigned long)fis_ptr);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	386 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	387 // Find next blank block
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	388 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	389 while (area_start < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	390 if (*area_start == (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	391 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	392 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	393 area_start += block_size / sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	394 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	395 fis_ptr = area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	396 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	397 fis_ptr += block_size / sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	398 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	399 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	400 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	401 printf(" 0x%08lX .. 0x%08lX\n",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	402 (unsigned long)area_start, (unsigned long)fis_ptr);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	403 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	404 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	405
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	406 // 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	407 static bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	408 fis_find_free(unsigned long *addr, unsigned long length)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	409 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	410 unsigned long fis_ptr, fis_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	411 unsigned long *area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	412
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	413 // Do not search the area reserved for pre-RedBoot systems:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	414 fis_ptr = (unsigned long *)((unsigned long)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	415 fis_end = (unsigned long *)(unsigned long)flash_end;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	416 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	417 while (fis_ptr < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	418 if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	419 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	420 // Assume that this is something
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	421 if ((fis_ptr-area_start) >= length) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	422 *addr = (unsigned long)area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	423 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	424 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	425 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	426 // Find next blank block
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	427 area_start = fis_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	428 while (area_start < fis_end) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	429 if (*area_start == (unsigned long)0xFFFFFFFF) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	430 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	431 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	432 area_start += block_size / sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	433 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	434 fis_ptr = area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	435 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	436 fis_ptr += block_size / sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	437 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	438 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	439 if (area_start != fis_ptr) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	440 if ((fis_ptr-area_start) >= length) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	441 *addr = (unsigned long)area_start;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	442 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	443 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	444 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	445 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	446 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	447
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	448 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	449 fis_create(int argc, char *argv[])
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 int i, stat;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	452 unsigned long mem_addr, exec_addr, flash_addr, entry_addr, length, img_size;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	453 char *name;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	454 bool mem_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	455 bool exec_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	456 bool entry_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	457 bool flash_addr_set = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	458 bool length_set = false;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	459 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	460 bool no_copy = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	461 void fis_addr, err_addr;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	462 struct fis_image_desc *img;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	463 bool slot_found, defaults_assumed;
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	464 struct option_info opts[7];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	465 bool prog_ok;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	466
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	467 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	468 (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	469 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	470 (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	471 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	472 (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	473 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	474 (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	475 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	476 (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	477 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	478 (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	479 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	480 (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	481 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	482 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	483 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	484 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	485 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	486
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	487 defaults_assumed = false;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	488 if (name) {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	489 // Search existing files to acquire defaults for params not specified:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	490 fis_addr = (void *)((unsigned long)flash_end - block_size);
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	491 memcpy(fis_work_block, fis_addr, block_size);
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	492 img = (struct fis_image_desc *)fis_work_block;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	493 for (i = 0; i < block_size/sizeof(*img); i++, img++) {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	494 if ((img->name[0] != (unsigned char)0xFF) && (strcmp(name, img->name) == 0)) {
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	495 // Found it, so get any unset but necessary params from there:
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	496 if (!length_set) {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	497 length_set = true;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	498 length = img->size;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	499 defaults_assumed = true;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	500 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	501 if (!exec_addr_set) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	502 // Preserve "normal" behaviour
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	503 exec_addr_set = true;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	504 exec_addr = flash_addr_set ? flash_addr : mem_addr;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	505 }
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	506 if (!flash_addr_set) {
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	507 flash_addr_set = true;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	508 flash_addr = img->flash_base;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	509 defaults_assumed = true;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	510 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	511 break;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	512 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	513 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	514 }
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	515
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	516 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	517 !length_set \|\| !name) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	518 fis_usage("required parameter missing");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	519 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	520 }
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	521 if (!img_size_set) {
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	522 img_size = length;
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	523 }
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	524 // '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	525 // 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	526 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	527 length = ((length + block_size - 1) / block_size) * block_size;
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	528 if (length < img_size) {
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	529 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	530 return;
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	531 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	532 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	533 if (flash_addr_set &&
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	534 ((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	535 (stat = flash_verify_addr((void *)(flash_addr+img_size-1))))) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	536 printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	537 printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	538 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	539 }
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	540 if (flash_addr_set && flash_addr & (block_size-1)) {
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	541 printf("Invalid FLASH address: %p\n", (void *)flash_addr);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	542 printf(" must be 0x%x aligned\n", block_size);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	543 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	544 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	545 if (strlen(name) >= sizeof(img->name)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	546 printf("Name is too long, must be less than %d chars\n", (int)sizeof(img->name));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	547 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	548 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	549 if (!no_copy) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	550 if ((mem_addr < (unsigned long)ram_start) \|\|
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	551 ((mem_addr+img_size) >= (unsigned long)ram_end)) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	552 printf("** WARNING: RAM address: %p may be invalid\n", (void *)mem_addr);
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	553 printf(" valid range is %p-%p\n", (void )ram_start, (void )ram_end);
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	554 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	555 if (!flash_addr_set && !fis_find_free(&flash_addr, length)) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	556 printf("Can't locate %ld bytes free in FLASH\n", length);
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	557 return;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	558 }
115 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 a slot in the directory for this entry
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	561 // First, see if an image by this name is already present
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	562 slot_found = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	563 fis_addr = (void *)((unsigned long)flash_end - block_size);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	564 memcpy(fis_work_block, fis_addr, block_size);
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	565 img = (struct fis_image_desc *)fis_work_block;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	566 for (i = 0; i < block_size/sizeof(*img); i++, img++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	567 if ((img->name[0] != (unsigned char)0xFF) && (strcmp(name, img->name) == 0)) {
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	568 if (flash_addr_set && (img->flash_base != flash_addr)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	569 printf("Image found, but FLASH address incorrect\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	570 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	571 }
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	572 if (img->size != length) {
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	573 printf("Image found, but LENGTH is incorrect (0x%lx != 0x%lx)\n", img->size, length);
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	574 return;
518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	575 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	576 if (!verify_action("An image named '%s' exists", name)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	577 return;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	578 } else {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	579 slot_found = true;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	580 if (defaults_assumed) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	581 if (!verify_action("* CAUTION * about to program '%s'\n at %p..%p from %p",
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	582 name, (void )flash_addr, (void )(flash_addr+img_size-1),
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	583 (void *)mem_addr)) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	584 return; // The guy gave up
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	585 }
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	586 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	587 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	588 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	589 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	590 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	591 // If not found, try and find an empty slot
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	592 if (!slot_found) {
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	593 img = (struct fis_image_desc *)fis_work_block;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	594 for (i = 0; i < block_size/sizeof(*img); i++, img++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	595 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	596 slot_found = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	597 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	598 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	599 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	600 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	601 if (!no_copy) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	602 // 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	603 if (flash_code_overlaps((void )flash_addr, (void )(flash_addr+img_size-1))) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	604 printf("Can't program this region - contains code in use!\n");
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	605 return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	606 }
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	607 prog_ok = true;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	608 if (prog_ok) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	609 // Erase area to be programmed
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	610 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	611 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	612 prog_ok = false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	613 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	614 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	615 if (prog_ok) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	616 // Now program it
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	617 if ((stat = flash_program((void )flash_addr, (void )mem_addr, img_size, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	618 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	619 prog_ok = false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	620 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	621 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	622 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	623 // Update directory
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	624 memset(img, 0, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	625 strcpy(img->name, name);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	626 img->flash_base = flash_addr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	627 img->mem_base = exec_addr_set ? exec_addr : (flash_addr_set ? flash_addr : mem_addr);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	628 img->entry_point = entry_addr_set ? entry_addr : (unsigned long)entry_address; // Hope it's been set
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	629 img->size = length;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	630 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	631 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	632 img->file_cksum = 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	633 #endif
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	634 #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	635 // Insure [quietly] that the directory is unlocked before trying to update
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	636 flash_unlock((void )fis_addr, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	637 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	638 if ((stat = flash_erase((void )fis_addr, block_size, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	639 printf("Error erasing 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	640 // Don't try to program if the erase failed
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	641 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	642 // Now program it
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	643 if ((stat = flash_program((void )fis_addr, (void )fis_work_block, block_size, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	644 printf("Error programming 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	645 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	646 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	647 #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	648 // Insure [quietly] that the directory is locked after the update
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	649 flash_lock((void )fis_addr, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	650 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	651 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	652
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	653 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	654 fis_delete(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	655 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	656 char *name;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	657 int i, stat;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	658 void fis_addr, err_addr;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	659 struct fis_image_desc *img;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	660 bool slot_found;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	661
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	662 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	663 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	664 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	665 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	666 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	667
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	668 slot_found = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	669 fis_addr = (void *)((unsigned long)flash_end - block_size);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	670 memcpy(fis_work_block, fis_addr, block_size);
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	671 img = (struct fis_image_desc *)fis_work_block;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	672 i = 0;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	673 #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	674 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	675 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	676 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	677 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	678 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	679 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	680 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	681 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	682 #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	683 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	684 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	685 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	686 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	687 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	688 #if 1 // And the descriptor for the descriptor table itself
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	689 i++;
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	690 #endif
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	691 img += i; // Skip reserved files
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	692
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	693 for ( /* i, img /; i < block_size/sizeof(img); i++, img++) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	694 if ((img->name[0] != (unsigned char)0xFF) && (strcmp(name, img->name) == 0)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	695 if (!verify_action("Delete image '%s'", name)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	696 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	697 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	698 slot_found = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	699 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	700 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	701 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	702 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	703 if (!slot_found) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	704 printf("No image '%s' found\n", name);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	705 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	706 }
119 77cec8369160 Merge from eCos master repository on 2000-09-01-07:47:03-BST jlarmour parents: 117 diff changeset	707 // Erase Data blocks (free space)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	708 if ((stat = flash_erase((void )img->flash_base, img->size, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	709 printf("Error erasing 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	710 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	711 #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	712 // Insure [quietly] that the directory is unlocked before trying to update
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	713 flash_unlock((void )fis_addr, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	714 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	715 // Update directory
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	716 memset(img, 0xFF, sizeof(*img));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	717 if ((stat = flash_erase((void )fis_addr, block_size, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	718 printf("Error erasing 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	719 // Don't try to program if the erase failed
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	720 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	721 // Now program it
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	722 if ((stat = flash_program((void )fis_addr, (void )fis_work_block, block_size, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	723 printf("Error programming 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	724 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	725 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	726 #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	727 // Insure [quietly] that the directory is locked after the update
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	728 flash_lock((void )fis_addr, block_size, (void *)&err_addr);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	729 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	730 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	731
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	732 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	733 fis_load(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	734 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	735 char *name;
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	736 struct fis_image_desc *img;
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	737 unsigned long mem_addr;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	738 bool mem_addr_set = false;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	739 bool show_cksum = false;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	740 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	741 #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	742 unsigned long cksum;
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	743 #endif
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	744 int num_options;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	745 #ifdef CYGPKG_COMPRESS_ZLIB
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	746 bool decompress = false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	747 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	748
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	749 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	750 (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	751 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	752 (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	753 num_options = 2;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	754 #ifdef CYGPKG_COMPRESS_ZLIB
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	755 init_opts(&opts[2], 'd', false, OPTION_ARG_TYPE_FLG,
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	756 (void **)&decompress, 0, "decompress");
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	757 num_options++;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	758 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	759
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	760 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	761 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	762 fis_usage("invalid arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	763 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	764 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	765 if ((img = fis_lookup(name)) == (struct fis_image_desc *)0) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	766 printf("No image '%s' found\n", name);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	767 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	768 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	769 if (!mem_addr_set) {
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	770 mem_addr = img->mem_base;
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	771 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	772 // Load image from FLASH into RAM
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	773 if ((mem_addr < (unsigned long)user_ram_start) \|\|
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	774 ((mem_addr+img->size) >= (unsigned long)user_ram_end)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	775 printf("Not a loadable image\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	776 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	777 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	778 #ifdef CYGPKG_COMPRESS_ZLIB
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	779 if (decompress) {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	780 int err;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	781 _pipe_t fis_load_pipe;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	782 _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	783 p->out_buf = (unsigned char*) mem_addr;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	784 p->out_size = -1;
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	785 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	786 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	787
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	788 err = (*_dc_init)(p);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	789
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	790 if (0 == err)
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	791 err = (*_dc_inflate)(p);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	792
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	793 // 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	794 // error value.
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	795 err = (*_dc_close)(p, err);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	796
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	797 if (0 != err && p->msg) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	798 printf("decompression error: %s\n", p->msg);
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	799 } else {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	800 printf("Image loaded from %p-%p\n", (unsigned char *)mem_addr, p->out_buf);
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	801 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	802
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	803 } else // dangling block
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	804 #endif
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	805 {
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	806 memcpy((void )mem_addr, (void )img->flash_base, img->data_length);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	807 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	808 entry_address = (unsigned long *)img->entry_point;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	809 #ifdef CYGPKG_REDBOOT_FIS_CRC_CHECK
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	810 cksum = 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	811 if (show_cksum) {
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	812 printf("Checksum: 0x%08lx\n", cksum);
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	813 }
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	814 // 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	815 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	816 if (cksum != img->file_cksum) {
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	817 printf("** Warning - checksum failure. stored: 0x%08lx, computed: 0x%08lx\n",
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	818 img->file_cksum, cksum);
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	819 }
0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	820 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	821 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	822 }
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	823 #endif // CYGOPT_REDBOOT_FIS
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	824
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	825 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	826 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	827 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	828 int stat;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	829 unsigned long mem_addr, flash_addr, length;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	830 bool mem_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	831 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	832 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	833 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	834 struct option_info opts[3];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	835 bool prog_ok;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	836
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	837 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	838 (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	839 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	840 (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	841 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	842 (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	843 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	844 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	845 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	846 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	847 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	848
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	849 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	850 fis_usage("required parameter missing");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	851 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	852 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	853
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	854 // 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	855 #ifndef CYGPKG_HAL_MIPS // FIXME: compiler is b0rken
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	856 length = ((length + block_size - 1) / block_size) * block_size;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	857 #endif
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	858 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	859 ((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	860 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	861 printf("Invalid FLASH address %p: (%s)\n", (void *)flash_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	862 printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	863 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	864 }
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	865 if (flash_addr_set && flash_addr & (block_size-1)) {
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	866 printf("Invalid FLASH address: %p\n", (void *)flash_addr);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	867 printf(" must be 0x%x aligned\n", block_size);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	868 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	869 }
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	870 if ((mem_addr < (unsigned long)ram_start) \|\|
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	871 ((mem_addr+length) >= (unsigned long)ram_end)) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	872 printf("** WARNING: RAM address: %p may be invalid\n", (void *)mem_addr);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	873 printf(" valid range is %p-%p\n", (void )ram_start, (void )ram_end);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	874 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	875 // 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	876 if (flash_code_overlaps((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	877 printf("Can't program this region - contains code in use!\n");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	878 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	879 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	880 if (!verify_action("* CAUTION * about to program FLASH at %p..%p from %p",
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	881 (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	882 (void *)mem_addr)) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	883 return; // The guy gave up
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	884 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	885 prog_ok = true;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	886 if (prog_ok) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	887 // Erase area to be programmed
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	888 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	889 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	890 prog_ok = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	891 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	892 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	893 if (prog_ok) {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	894 // Now program it
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	895 if ((stat = flash_program((void )flash_addr, (void )mem_addr, length, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	896 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	897 prog_ok = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	898 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	899 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	900 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	901
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	902 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	903 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	904 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	905 int stat;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	906 unsigned long flash_addr, length;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	907 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	908 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	909 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	910 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	911
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	912 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	913 (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	914 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	915 (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	916 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	917 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	918 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	919 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	920 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	921
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	922 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	923 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	924 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	925 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	926 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	927 ((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	928 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	929 printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	930 printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	931 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	932 }
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	933 if (flash_addr_set && flash_addr & (block_size-1)) {
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	934 printf("Invalid FLASH address: %p\n", (void *)flash_addr);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	935 printf(" must be 0x%x aligned\n", block_size);
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	936 return;
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 172 diff changeset	937 }
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	938 // 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	939 if (flash_code_overlaps((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	940 printf("Can't erase this region - contains code in use!\n");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	941 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	942 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	943 if ((stat = flash_erase((void )flash_addr, length, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	944 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	945 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	946 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	947
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	948 #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	949
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	950 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	951 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	952 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	953 int stat;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	954 unsigned long flash_addr, length;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	955 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	956 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	957 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	958 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	959
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	960 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	961 (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	962 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	963 (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	964 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	965 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	966 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	967 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	968 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	969
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	970 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	971 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	972 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	973 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	974 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	975 ((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	976 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	977 printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	978 printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	979 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	980 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	981 if ((stat = flash_lock((void )flash_addr, length, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	982 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	983 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	984 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	985
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	986 static void
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	987 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	988 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	989 int stat;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	990 unsigned long flash_addr, length;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	991 bool flash_addr_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	992 bool length_set = false;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	993 void *err_addr;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	994 struct option_info opts[2];
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	995
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	996 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	997 (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	998 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	999 (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	1000 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	1001 {
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1002 fis_usage("invalid arguments");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1003 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1004 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1005
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1006 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	1007 fis_usage("missing argument");
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1008 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1009 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1010 if (flash_addr_set &&
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1011 ((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	1012 (stat = flash_verify_addr((void *)(flash_addr+length-1))))) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1013 printf("Invalid FLASH address %p: %s\n", (void *)flash_addr, flash_errmsg(stat));
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1014 printf(" valid range is %p-%p\n", (void )flash_start, (void )flash_end);
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1015 return;
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1016 }
2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1017 if ((stat = flash_unlock((void )flash_addr, length, (void *)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1018 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	1019 }
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 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1022
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1023 static int __flash_init = 0;
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1024
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1025 void
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1026 _flash_info(void)
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1027 {
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1028 if (!__flash_init) return;
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1029 printf("FLASH: %p - %p, %d blocks of %p bytes each.\n",
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1030 flash_start, flash_end, blocks, (void *)block_size);
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1031 }
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1032
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1033 static bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1034 do_flash_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1035 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1036 int stat;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1037
171 42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1038 if (!__flash_init) {
42f843b391aa Merge from eCos master repository on 2001-07-18-03:13:25-BST jlarmour parents: 165 diff changeset	1039 __flash_init = 1;
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	1040 if ((stat = flash_init((void *)(workspace_end-FLASH_MIN_WORKSPACE),
162 2395031e7a66 Merge from eCos master repository on 2001-06-15-06:43:03-BST jlarmour parents: 161 diff changeset	1041 FLASH_MIN_WORKSPACE, printf)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1042 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	1043 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1044 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1045 flash_get_limits((void )0, (void )&flash_start, (void *)&flash_end);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1046 flash_get_block_info(&block_size, &blocks);
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	1047 fis_work_block = (unsigned char *)(workspace_end-FLASH_MIN_WORKSPACE-block_size);
b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 154 diff changeset	1048 workspace_end = fis_work_block;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1049 fisdir_size = block_size;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1050 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1051 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1052 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1053
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1054 #ifndef CYGOPT_REDBOOT_FLASH_CONFIG
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1055 RedBoot_init(do_flash_init, RedBoot_INIT_FIRST);
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1056 #endif
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1057
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1058 static void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1059 do_fis(int argc, char *argv[])
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1060 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1061 struct cmd *cmd;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1062
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1063 if (argc < 2) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1064 fis_usage("too few arguments");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1065 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1066 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1067 if (!do_flash_init()) return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1068 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	1069 argv[1])) != (struct cmd *)0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1070 (cmd->fun)(argc, argv);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1071 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1072 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1073 fis_usage("unrecognized command");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1074 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1075
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1076 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1077 #include <flash_config.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1078
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1079 // Configuration data, saved in FLASH, used to set/update RedBoot
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1080 // normal "configuration" data items.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1081 static struct _config {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1082 unsigned long len;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1083 unsigned long key1;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1084 unsigned char config_data[MAX_CONFIG_DATA-(4*4)];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1085 unsigned long key2;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1086 unsigned long cksum;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1087 } config;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1088 static bool config_ok;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1089
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1090 #define CONFIG_KEY1 0x0BADFACE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1091 #define CONFIG_KEY2 0xDEADDEAD
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1092
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1093 #define CONFIG_DONE 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1094 #define CONFIG_ABORT -1
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1095 #define CONFIG_CHANGED 1
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1096 #define CONFIG_OK 2
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1097 #define CONFIG_BACK 3
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1098 #define CONFIG_BAD 4
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1099
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1100 // 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	1101 // 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	1102 // 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	1103 // 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	1104 // ordered, thus the peculiar naming.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1105 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	1106 boot_script,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1107 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1108 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1109 false
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1110 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1111 RedBoot_config_option("Boot script",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1112 boot_script_data,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1113 "boot_script", true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1114 CONFIG_SCRIPT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1115 ""
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1116 );
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1117 // 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	1118 #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	1119 #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	1120 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	1121 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	1122 "ms resolution)"),
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1123 boot_script_timeout,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1124 "boot_script", true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1125 CONFIG_INT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1126 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1127 );
130 eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1128 #undef __cat
eb9fd8c04db3 Merge from eCos master repository on 2000-10-23-17:01:37-BST jlarmour parents: 126 diff changeset	1129 #undef _cat
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1130
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1131 #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	1132 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	1133 console_baud_rate,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1134 ALWAYS_ENABLED, true,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1135 CONFIG_INT,
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1136 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	1137 );
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1138 #endif
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1139
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1140 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	1141 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	1142
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1143 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	1144
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1145 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1146 // Layout of config data
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1147 // 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	1148 // encoded into the object.
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1149 // offset contents
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1150 // 0 data type
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1151 // 1 length of name (N)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1152 // 2 enable sense
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1153 // 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	1154 // 4 key name
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1155 // N+4 enable key
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1156 // M+N+4 data value
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1157 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1158
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1159 #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	1160 #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	1161 #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	1162 #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	1163 #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	1164 #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	1165 #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	1166
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1167 #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	1168 #define LIST_OPT_NICKNAMES (2)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1169 #define LIST_OPT_FULLNAMES (4)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1170
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1171 static void config_init(void);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1172
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1173 static int
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1174 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	1175 {
145 2e9a636d9de9 Merge from eCos master repository on 2000-12-21-14:18:40-GMT jlarmour parents: 143 diff changeset	1176 char line[256], sp, lp;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1177 int ret;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1178 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	1179 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	1180 #ifdef CYGPKG_REDBOOT_NETWORKING
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1181 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	1182 enet_addr_t hold_esa_val;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1183 int esa_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1184 char *esp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1185 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1186 void *val_ptr;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1187 int type;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1188
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1189 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	1190 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	1191 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	1192 (!(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	1193 return CONFIG_OK; // Disabled field
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1194 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1195 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1196 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	1197 if (LIST_OPT_NICKNAMES & list_opt)
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1198 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	1199 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	1200 if (title != (char *)NULL) {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1201 printf("%s: ", title);
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1202 } else {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1203 printf("%s: ", CONFIG_OBJECT_KEY(dp));
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1204 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1205 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1206 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	1207 case CONFIG_BOOL:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1208 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	1209 printf("%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	1210 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1211 case CONFIG_INT:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1212 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	1213 printf("%ld ", hold_int_val);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1214 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1215 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1216 case CONFIG_IP:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1217 printf("%s ", inet_ntoa((in_addr_t *)val_ptr));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1218 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1219 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1220 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	1221 printf("0x%02X", ((unsigned char *)val_ptr)[esa_ptr]);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1222 if (esa_ptr < (sizeof(enet_addr_t)-1)) printf(":");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1223 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1224 printf(" ");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1225 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1226 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1227 case CONFIG_STRING:
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1228 printf("%s ", (unsigned char *)val_ptr);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1229 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1230 case CONFIG_SCRIPT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1231 printf("\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1232 sp = lp = (unsigned char *)val_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1233 while (*sp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1234 while (*lp != '\n') lp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1235 *lp = '\0';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1236 printf(".. %s\n", sp);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1237 *lp++ = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1238 sp = lp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1239 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1240 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1241 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1242 if (LIST_OPT_LIST_ONLY & list_opt) {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1243 printf("\n");
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1244 return CONFIG_OK;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1245 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1246 if (type != CONFIG_SCRIPT) {
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1247 if (NULL != newvalue) {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1248 ret = strlen(newvalue);
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1249 if (ret > sizeof(line))
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1250 return CONFIG_BAD;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1251 strcpy(line, newvalue);
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1252 printf("Setting to %s\n", newvalue);
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1253 }
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1254 else // read from terminal
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1255 ret = gets(line, sizeof(line), 0);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1256 if (ret < 0) return CONFIG_ABORT;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1257 if (strlen(line) == 0) return CONFIG_OK; // Just a CR - leave value untouched
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1258 if (line[0] == '.') return CONFIG_DONE;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1259 if (line[0] == '^') return CONFIG_BACK;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1260 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1261 switch (type) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1262 case CONFIG_BOOL:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1263 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	1264 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	1265 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1266 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1267 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	1268 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	1269 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1270 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1271 return CONFIG_OK;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1272 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1273 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1274 case CONFIG_INT:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1275 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	1276 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	1277 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1278 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1279 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	1280 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	1281 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1282 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1283 return CONFIG_OK;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1284 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1285 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1286 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1287 case CONFIG_IP:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1288 memcpy(&hold_ip_val.s_addr, &((in_addr_t *)val_ptr)->s_addr, sizeof(in_addr_t));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1289 if (!inet_aton(line, &new_ip_val)) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1290 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1291 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1292 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	1293 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	1294 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1295 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1296 return CONFIG_OK;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1297 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1298 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1299 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1300 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	1301 esp = line;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1302 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	1303 unsigned long esa_byte;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1304 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	1305 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	1306 return CONFIG_BAD;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1307 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1308 ((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	1309 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1310 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1311 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1312 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1313 case CONFIG_SCRIPT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1314 // Assume it always changes
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1315 sp = (unsigned char *)val_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1316 printf("Enter script, terminate with empty line\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1317 while (true) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1318 *sp = '\0';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1319 printf(">> ");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1320 ret = gets(line, sizeof(line), 0);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1321 if (ret < 0) return CONFIG_ABORT;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1322 if (strlen(line) == 0) break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1323 lp = line;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1324 while (*lp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1325 sp++ = lp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1326 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1327 *sp++ = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1328 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1329 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1330 case CONFIG_STRING:
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1331 if (strlen(line) >= MAX_STRING_LENGTH) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1332 printf("Sorry, value is too long\n");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1333 return CONFIG_BAD;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1334 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1335 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	1336 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1337 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1338 return CONFIG_CHANGED;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1339 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1340
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1341 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1342 // Manage configuration information with the FLASH
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1343 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1344
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1345 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1346 config_length(int type)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1347 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1348 switch (type) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1349 case CONFIG_BOOL:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1350 return sizeof(bool);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1351 case CONFIG_INT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1352 return sizeof(unsigned long);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1353 #ifdef CYGPKG_REDBOOT_NETWORKING
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1354 case CONFIG_IP:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1355 return sizeof(in_addr_t);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1356 case CONFIG_ESA:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1357 // 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	1358 // 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	1359 return 8;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1360 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1361 case CONFIG_STRING:
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1362 return MAX_STRING_LENGTH;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1363 case CONFIG_SCRIPT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1364 return MAX_SCRIPT_LENGTH;
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1365 default:
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1366 return 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1367 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1368 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1369
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1370 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	1371 RedBoot_cmd("fconfig",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1372 "Manage configuration kept in FLASH memory",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1373 "[-i] [-l] [-n] [-f] \| nickname [value]",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1374 do_flash_config
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1375 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1376
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1377 static void
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1378 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	1379 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1380 bool need_update = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1381 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	1382 struct config_option *opt = __CONFIG_options_TAB__;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1383 struct _config hold_config;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1384 struct option_info opts[4];
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1385 bool list_only;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1386 bool nicknames;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1387 bool fullnames;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1388 int list_opt = 0;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1389 unsigned char *dp;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1390 int len, ret;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1391 char *title;
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1392 char *onlyone = NULL;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1393 char *onevalue = NULL;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1394 bool doneone = false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1395 bool init = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1396
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1397 if (!do_flash_init()) return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1398 memcpy(&hold_config, &config, sizeof(config));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1399 script = (unsigned char *)0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1400
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1401 init_opts(&opts[0], 'l', false, OPTION_ARG_TYPE_FLG,
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1402 (void *)&list_only, (bool )0, "list configuration only");
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1403 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	1404 (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	1405 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	1406 (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	1407 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	1408 (void *)&init, (bool )0, "initialize configuration database");
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1409
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1410 // 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	1411 // by just quoting its nickname
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1412 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	1413 (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	1414 // 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	1415 onlyone = argv[1];
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1416 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	1417 list_opt = LIST_OPT_NICKNAMES;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1418 }
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1419 else {
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1420 if (!scan_opts(argc, argv, 1, opts, 4, 0, 0, ""))
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1421 return;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1422 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	1423 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	1424 list_opt \|= fullnames ? LIST_OPT_FULLNAMES : 0;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1425 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	1426
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1427 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	1428 config_init();
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1429 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1430
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1431 dp = &config.config_data[0];
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1432 while (dp < &config.config_data[sizeof(config.config_data)]) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1433 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	1434 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1435 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1436 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	1437 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	1438 // 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	1439 title = (char *)NULL;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1440 opt = __CONFIG_options_TAB__;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1441 while (opt != optend) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1442 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	1443 title = opt->title;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1444 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1445 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1446 opt++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1447 }
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1448 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	1449 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	1450 else {
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1451 doneone = true;
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1452 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	1453 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1454 switch (ret) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1455 case CONFIG_DONE:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1456 goto done;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1457 case CONFIG_ABORT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1458 memcpy(&config, &hold_config, sizeof(config));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1459 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1460 case CONFIG_CHANGED:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1461 need_update = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1462 case CONFIG_OK:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1463 dp += len;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1464 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1465 case CONFIG_BACK:
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1466 dp = &config.config_data[0];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1467 continue;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1468 case CONFIG_BAD:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1469 // Nothing - make him do it again
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1470 printf ("** invalid entry\n");
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1471 }
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1474 done:
159 511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1475 if (NULL != onlyone && !doneone) {
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1476 #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	1477 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	1478 struct config_option opt;
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1479 printf("Trying to add value\n");
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1480 }
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1481 #else
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1482 printf("** entry '%s' not found", onlyone);
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1483 #endif
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1484 }
157 b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1485 if (!need_update)
b65ec671dd4c Merge from eCos master repository on 2001-04-06-18:28:36-BST jlarmour parents: 156 diff changeset	1486 return;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1487 flash_write_config();
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1488 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1489
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1490
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1491 #ifdef CYGSEM_REDBOOT_FLASH_ALIASES
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1492 static cmd_fun do_alias;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1493 RedBoot_cmd("alias",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1494 "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	1495 "name [value]",
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1496 do_alias
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1497 );
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1498
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1499 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1500 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	1501 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1502 sprintf(alias, "alias/%s", name);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1503 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1504
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1505 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1506 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	1507 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1508 char name[80];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1509 char *val;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1510 struct config_option opt;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1511
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1512 switch (argc) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1513 case 2:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1514 make_alias(name, argv[1]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1515 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	1516 printf("'%s' = '%s'\n", argv[1], val);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1517 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1518 printf("'%s' not found\n", argv[1]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1519 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1520 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1521 case 3:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1522 if (strlen(argv[2]) >= MAX_STRING_LENGTH) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1523 printf("Sorry, value is too long\n");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1524 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1525 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1526 make_alias(name, argv[1]);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1527 opt.type = CONFIG_STRING;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1528 opt.enable = (char *)0;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1529 opt.enable_sense = 1;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1530 opt.key = name;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1531 opt.dflt = (unsigned long)argv[2];
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1532 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	1533 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1534 default:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1535 printf("usage: alias name [value]\n");
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1536 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1537 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1538
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1539 static char *
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1540 lookup_alias(char *alias)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1541 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1542 char name[80];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1543 char *val;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1544
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1545 make_alias(name, alias);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1546 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	1547 return val;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1548 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1549 return (char *)NULL;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1550 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1551 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1552
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1553 bool
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1554 _expand_aliases(char *line, int len)
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1555 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1556 char *lp = line;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1557 char ms, me, *ep;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1558 char *alias;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1559 char c;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1560 int offset, line_len, alias_len;
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1561 bool macro_found = false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1562
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1563 if ((line_len = strlen(line)) != 0) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1564 while (*lp) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1565 c = *lp++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1566 if ((c == '%') && (*lp == '{')) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1567 // Found a macro/alias to expand
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1568 ms = lp+1;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1569 lp += 2;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1570 while (lp && (lp != '}')) lp++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1571 if (!*lp) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1572 printf("Invalid macro/alias '%s'\n", ms);
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1573 line[0] = '\0'; // Destroy line
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1574 return false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1575 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1576 me = lp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1577 *me = '\0';
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1578 lp++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1579 if ((alias = lookup_alias(ms)) != (char *)NULL) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1580 alias_len = strlen(alias);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1581 // See if there is room in the line to expand this macro/alias
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1582 if ((line_len+alias_len) < len) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1583 // Make a hole by moving data within the line
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1584 offset = alias_len-strlen(ms)-2; // Number of bytes being inserted
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1585 ep = &lp[strlen(lp)-1];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1586 me = &ep[offset];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1587 while (ep != (lp-1)) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1588 ep[offset-1] = *ep--;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1589 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1590 *me = '\0';
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1591 // Insert the macro/alias data
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1592 lp = ms-2;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1593 while (*alias) {
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1594 if ((alias[0] == '%') && (alias[1] == '{')) macro_found = true;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1595 lp++ = alias++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1596 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1597 line_len = strlen(line);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1598 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1599 printf("No room to expand '%s'\n", ms);
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1600 line[0] = '\0'; // Destroy line
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1601 return false;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1602 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1603 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1604 printf("Alias '%s' not defined\n", ms);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1605 *me = '\|';
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1606 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1607 } else if (c == '"') {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1608 // Skip quoted strings
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1609 while (lp && (lp != '"')) lp++;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1610 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1611 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1612 }
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1613 return macro_found;
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1614 }
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1615
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1616 void
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1617 expand_aliases(char *line, int len)
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1618 {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1619 while (_expand_aliases(line, len)) ;
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1620 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1621 #endif // CYGSEM_REDBOOT_FLASH_ALIASES
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1622
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1623 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1624 // 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	1625 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1626 void
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1627 flash_write_config(void)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1628 {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1629 int stat;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1630 void *err_addr;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1631
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1632 config.len = sizeof(config);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1633 config.key1 = CONFIG_KEY1;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1634 config.key2 = CONFIG_KEY2;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1635 config.cksum = crc32((unsigned char *)&config, sizeof(config)-sizeof(config.cksum));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1636 if (verify_action("Update RedBoot non-volatile configuration")) {
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1637 #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	1638 // 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	1639 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	1640 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1641 if ((stat = flash_erase(cfg_base, cfg_size, (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1642 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	1643 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1644 if ((stat = flash_program(cfg_base, (void *)&config,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1645 sizeof(config), (void **)&err_addr)) != 0) {
177 4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1646 printf("Error writing config data at %p: %s\n",
4c750ce71ae3 Merge from eCos master repository on 2001-08-10-19:22:57-BST jlarmour parents: 174 diff changeset	1647 err_addr, flash_errmsg(stat));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1648 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1649 }
132 0ae0bc38e387 Merge from eCos master repository on 2000-10-31-00:30:36-GMT jlarmour parents: 130 diff changeset	1650 #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	1651 // 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	1652 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	1653 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1654 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1655 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1656
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1657 //
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1658 // 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	1659 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1660 static unsigned char *
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1661 flash_lookup_config(char *key)
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1662 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1663 unsigned char *dp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1664 int len;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1665
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1666 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	1667
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1668 dp = &config.config_data[0];
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1669 while (dp < &config.config_data[sizeof(config.config_data)]) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1670 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	1671 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	1672 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	1673 return dp;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1674 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1675 dp += len;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1676 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1677 // printf("Can't find config data for '%s'\n", key);
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1678 return false;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1679 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1680
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1681 //
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1682 // 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	1683 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1684 bool
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1685 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	1686 {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1687 unsigned char *dp;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1688 void *val_ptr;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1689
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1690 if (!config_ok) return false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1691
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1692 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	1693 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	1694 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	1695 switch (type) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1696 // 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	1697 case CONFIG_BOOL:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1698 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	1699 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1700 case CONFIG_INT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1701 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	1702 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1703 #ifdef CYGPKG_REDBOOT_NETWORKING
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1704 case CONFIG_IP:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1705 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	1706 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1707 case CONFIG_ESA:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1708 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	1709 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1710 #endif
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1711 case CONFIG_STRING:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1712 case CONFIG_SCRIPT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1713 // 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	1714 (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	1715 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1716 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1717 } else {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1718 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	1719 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1720 return true;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1721 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1722 return false;
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
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1725 //
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1726 // 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	1727 //
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1728 static void
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1729 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	1730 {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1731 switch (opt->type) {
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1732 // 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	1733 case CONFIG_BOOL:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1734 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	1735 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1736 case CONFIG_INT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1737 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	1738 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1739 #ifdef CYGPKG_REDBOOT_NETWORKING
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1740 case CONFIG_IP:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1741 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	1742 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1743 case CONFIG_ESA:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1744 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	1745 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1746 #endif
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1747 case CONFIG_STRING:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1748 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	1749 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1750 case CONFIG_SCRIPT:
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1751 break;
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1752 }
0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1753 }
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 //
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1756 // 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	1757 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1758 bool
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1759 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	1760 {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1761 unsigned char dp, kp;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1762 int len, elen, size;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1763
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1764 // 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	1765 // 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	1766 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	1767 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	1768 if (update) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1769 flash_write_config();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1770 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1771 return true;
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 // Add the data item
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1774 dp = &config.config_data[0];
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1775 size = 0;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1776 while (size < sizeof(config.config_data)) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1777 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	1778 kp = opt->key;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1779 len = strlen(kp) + 1;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1780 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	1781 if (opt->enable) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1782 elen = strlen(opt->enable) + 1;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1783 size += elen;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1784 } else {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1785 elen = 0;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1786 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1787 if (size > sizeof(config.config_data)) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1788 break;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1789 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1790 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	1791 CONFIG_OBJECT_KEYLEN(dp) = len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1792 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	1793 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	1794 dp = CONFIG_OBJECT_KEY(dp);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1795 while (kp) dp++ += *kp++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1796 *dp++ = '\0';
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1797 if (elen) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1798 kp = opt->enable;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1799 while (kp) dp++ += *kp++;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1800 *dp++ = '\0';
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1801 }
160 0d0f03f76f6a Merge from eCos master repository on 2001-06-01-18:52:13-BST jlarmour parents: 159 diff changeset	1802 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	1803 if (update) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1804 flash_write_config();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1805 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1806 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1807 } else {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1808 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	1809 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	1810 dp += len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1811 size += len;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1812 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1813 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1814 printf("No space to add '%s'\n", opt->key);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1815 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1816 }
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1817
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1818 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1819 // 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	1820 //
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1821 static void
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1822 config_init(void)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1823 {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1824 // Well known option strings
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1825 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	1826 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	1827
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1828 memset(&config, 0, sizeof(config));
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1829 while (opt != optend) {
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 160 diff changeset	1830 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	1831 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1832 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1833 opt++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1834 }
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1835 config_ok = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1836 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1837
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1838 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1839 // 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	1840 // 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	1841 // values for later use.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1842 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1843 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1844 load_flash_config(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1845 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1846 bool use_boot_script;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1847
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1848 config_ok = false;
126 518f42066aba Merge from eCos master repository on 2000-09-19-06:25:26-BST jlarmour parents: 121 diff changeset	1849 script = (unsigned char *)0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1850 if (!do_flash_init()) return;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1851 #define _roundup(n,s) ((((n)+(s-1))/s)*s)
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1852 cfg_size = (block_size > sizeof(config)) ? sizeof(config) :
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1853 _roundup(sizeof(config), block_size);
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 171 diff changeset	1854 cfg_base = (void *)((unsigned long)flash_end - (cfg_size+fisdir_size));
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1855 memcpy(&config, cfg_base, sizeof(config));
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 147 diff changeset	1856 if ((crc32((unsigned char *)&config, sizeof(config)-sizeof(config.cksum)) != config.cksum) \|\|
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1857 (config.key1 != CONFIG_KEY1)\|\| (config.key2 != CONFIG_KEY2)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1858 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	1859 config_init();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1860 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1861 }
153 5e8f3b328bb3 Merge from eCos master repository on 2001-02-19-15:48:12-GMT jlarmour parents: 152 diff changeset	1862 config_ok = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1863 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	1864 if (use_boot_script) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1865 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	1866 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	1867 }
165 d63db767121d Merge from eCos master repository on 2001-06-29-06:43:03-BST jlarmour parents: 162 diff changeset	1868 #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	1869 if (flash_get_config("console_baud_rate", &console_baud_rate, CONFIG_INT)) {
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1870 extern void set_console_baud_rate(int);
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1871 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	1872 }
511f4dc167f6 Merge from eCos master repository on 2001-05-18-01:30:05-BST jlarmour parents: 157 diff changeset	1873 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1874 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1875
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1876 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	1877
154 e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1878 #endif // CYGSEM_REDBOOT_FLASH_CONFIG
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1879
e2d866e32dac Merge from eCos master repository on 2001-02-26-23:18:05-GMT jlarmour parents: 153 diff changeset	1880 // EOF flash.c

Mercurial > flash_v2

annotate packages/redboot/current/src/flash.c @ 177:4c750ce71ae3