wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 1 | /* |
| 2 | * MOUSSE/MPC8240 Board definitions. |
| 3 | * Flash Routines for MOUSSE onboard AMD29LV106DB devices |
| 4 | * |
| 5 | * (C) Copyright 2000 |
| 6 | * Marius Groeger <mgroeger@sysgo.de> |
| 7 | * Sysgo Real-Time Solutions, GmbH <www.elinos.com> |
| 8 | * |
| 9 | * (C) Copyright 2000 |
| 10 | * Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
| 11 | * |
| 12 | * (C) Copyright 1999, by Curt McDowell, 08-06-99, Broadcom Corp. |
| 13 | * (C) Copyright 2001, James Dougherty, 07/18/01, Broadcom Corp. |
| 14 | * |
| 15 | * See file CREDITS for list of people who contributed to this |
| 16 | * project. |
| 17 | * |
| 18 | * This program is free software; you can redistribute it and/or |
| 19 | * modify it under the terms of the GNU General Public License as |
| 20 | * published by the Free Software Foundation; either version 2 of |
| 21 | * the License, or (at your option) any later version. |
| 22 | * |
| 23 | * This program is distributed in the hope that it will be useful, |
| 24 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 26 | * GNU General Public License for more details. |
| 27 | * |
| 28 | * You should have received a copy of the GNU General Public License |
| 29 | * along with this program; if not, write to the Free Software |
| 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
| 31 | * MA 02111-1307 USA |
| 32 | */ |
| 33 | |
| 34 | #include <common.h> |
| 35 | #include <mpc8xx.h> |
| 36 | #include <malloc.h> |
| 37 | #include "mousse.h" |
| 38 | #include "flash.h" |
| 39 | |
| 40 | int flashLibDebug = 0; |
| 41 | int flashLibInited = 0; |
| 42 | |
| 43 | #define OK 0 |
| 44 | #define ERROR -1 |
| 45 | #define STATUS int |
| 46 | #define PRINTF if (flashLibDebug) printf |
| 47 | #if 0 |
| 48 | #define PRIVATE static |
| 49 | #else |
| 50 | #define PRIVATE |
| 51 | #endif |
| 52 | |
Jean-Christophe PLAGNIOL-VILLARD | 0383694 | 2008-10-16 15:01:15 +0200 | [diff] [blame] | 53 | flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 54 | |
| 55 | #define SLEEP_DELAY 166 |
| 56 | #define FLASH_SECTOR_SIZE (64*1024) |
| 57 | /*********************************************************************** |
| 58 | * |
| 59 | * Virtual Flash Devices on Mousse board |
| 60 | * |
| 61 | * These must be kept in sync with the definitions in flashLib.h. |
| 62 | * |
| 63 | ***********************************************************************/ |
| 64 | |
| 65 | PRIVATE flash_dev_t flashDev[] = { |
| 66 | /* Bank 0 sector SA0 (16 kB) */ |
| 67 | { "SA0",FLASH0_BANK, FLASH0_SEG0_START, 1, 14, |
| 68 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 69 | }, |
| 70 | /* Bank 0 sector SA1 (8 kB) */ |
| 71 | { "SA1", FLASH0_BANK, FLASH0_SEG0_START + 0x4000, 1, 13, |
| 72 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 73 | }, |
| 74 | /* Bank 0 sector SA2 (8 kB) */ |
| 75 | { "SA2", FLASH0_BANK, FLASH0_SEG0_START + 0x6000, 1, 13, |
| 76 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 77 | }, |
| 78 | /* Bank 0 sector SA3 is occluded by Mousse I/O devices */ |
| 79 | /* Bank 0 sectors SA4-SA18, after Mousse devices up to PLCC (960 kB) */ |
| 80 | { "KERNEL", FLASH0_BANK, FLASH0_SEG1_START, 15, 16, |
| 81 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 82 | }, |
| 83 | /* Bank 0 sectors SA19-SA26, jumper can occlude this by PLCC (512 kB) */ |
| 84 | /* This is where the Kahlua boot vector and boot ROM code resides. */ |
| 85 | { "BOOT",FLASH0_BANK, FLASH0_SEG2_START, 8, 16, |
| 86 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 87 | }, |
| 88 | /* Bank 0 sectors SA27-SA34 (512 kB) */ |
| 89 | { "RAMDISK",FLASH0_BANK, FLASH0_SEG3_START, 8, 16, |
| 90 | FLASH0_VENDOR_ID, FLASH0_DEVICE_ID |
| 91 | }, |
| 92 | }; |
| 93 | |
| 94 | int flashDevCount = (sizeof (flashDev) / sizeof (flashDev[0])); |
| 95 | |
| 96 | #define DEV(no) (&flashDev[no]) |
| 97 | #define DEV_NO(dev) ((dev) - flashDev) |
| 98 | |
| 99 | /*********************************************************************** |
| 100 | * |
| 101 | * Private Flash Routines |
| 102 | * |
| 103 | ***********************************************************************/ |
| 104 | |
| 105 | /* |
| 106 | * The convention is: |
| 107 | * |
| 108 | * "addr" is always the PROM raw address, which is the address of an |
| 109 | * 8-bit quantity for flash 0 and 16-bit quantity for flash 1. |
| 110 | * |
| 111 | * "pos" is always a logical byte position from the PROM beginning. |
| 112 | */ |
| 113 | |
| 114 | #define FLASH0_ADDR(dev, addr) \ |
| 115 | ((unsigned char *) ((dev)->base + (addr))) |
| 116 | |
| 117 | #define FLASH0_WRITE(dev, addr, value) \ |
| 118 | (*FLASH0_ADDR(dev, addr) = (value)) |
| 119 | |
| 120 | #define FLASH0_READ(dev, addr) \ |
| 121 | (*FLASH0_ADDR(dev, addr)) |
| 122 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 123 | PRIVATE int flashCheck (flash_dev_t * dev) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 124 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 125 | if (!flashLibInited) { |
| 126 | printf ("flashCheck: flashLib not initialized\n"); |
| 127 | return ERROR; |
| 128 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 129 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 130 | if (dev < &flashDev[0] || dev >= &flashDev[flashDevCount]) { |
| 131 | printf ("flashCheck: Bad dev parameter\n"); |
| 132 | return ERROR; |
| 133 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 134 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 135 | if (!dev->found) { |
| 136 | printf ("flashCheck: Device %d not available\n", DEV_NO (dev)); |
| 137 | return ERROR; |
| 138 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 139 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 140 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 141 | } |
| 142 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 143 | PRIVATE void flashReset (flash_dev_t * dev) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 144 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 145 | PRINTF ("flashReset: dev=%d\n", DEV_NO (dev)); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 146 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 147 | if (dev->bank == FLASH0_BANK) { |
| 148 | FLASH0_WRITE (dev, 0x555, 0xaa); |
| 149 | FLASH0_WRITE (dev, 0xaaa, 0x55); |
| 150 | FLASH0_WRITE (dev, 0x555, 0xf0); |
| 151 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 152 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 153 | udelay (SLEEP_DELAY); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 154 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 155 | PRINTF ("flashReset: done\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 156 | } |
| 157 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 158 | PRIVATE int flashProbe (flash_dev_t * dev) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 159 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 160 | int rv, deviceID, vendorID; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 161 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 162 | PRINTF ("flashProbe: dev=%d\n", DEV_NO (dev)); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 163 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 164 | if (dev->bank != FLASH0_BANK) { |
| 165 | rv = ERROR; |
| 166 | goto DONE; |
| 167 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 168 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 169 | FLASH0_WRITE (dev, 0xaaa, 0xaa); |
| 170 | FLASH0_WRITE (dev, 0x555, 0x55); |
| 171 | FLASH0_WRITE (dev, 0xaaa, 0x90); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 172 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 173 | udelay (SLEEP_DELAY); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 174 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 175 | vendorID = FLASH0_READ (dev, 0); |
| 176 | deviceID = FLASH0_READ (dev, 2); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 177 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 178 | FLASH0_WRITE (dev, 0, 0xf0); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 179 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 180 | PRINTF ("flashProbe: vendor=0x%x device=0x%x\n", vendorID, deviceID); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 181 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 182 | if (vendorID == dev->vendorID && deviceID == dev->deviceID) |
| 183 | rv = OK; |
| 184 | else |
| 185 | rv = ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 186 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 187 | DONE: |
| 188 | PRINTF ("flashProbe: rv=%d\n", rv); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 189 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 190 | return rv; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 191 | } |
| 192 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 193 | PRIVATE int flashWait (flash_dev_t * dev, int addr, int expect, int erase) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 194 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 195 | int rv = ERROR; |
| 196 | int i, data; |
| 197 | int polls; |
| 198 | |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 199 | #if 0 |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 200 | PRINTF ("flashWait: dev=%d addr=0x%x expect=0x%x erase=%d\n", |
| 201 | DEV_NO (dev), addr, expect, erase); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 202 | #endif |
| 203 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 204 | if (dev->bank != FLASH0_BANK) { |
| 205 | rv = ERROR; |
| 206 | goto done; |
| 207 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 208 | |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 209 | if (erase) |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 210 | polls = FLASH_ERASE_SECTOR_TIMEOUT; /* Ticks */ |
| 211 | else |
| 212 | polls = FLASH_PROGRAM_POLLS; /* Loops */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 213 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 214 | for (i = 0; i < polls; i++) { |
| 215 | if (erase) |
| 216 | udelay (SLEEP_DELAY); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 217 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 218 | data = FLASH0_READ (dev, addr); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 219 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 220 | if (((data ^ expect) & 0x80) == 0) { |
| 221 | rv = OK; |
| 222 | goto done; |
| 223 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 224 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 225 | if (data & 0x20) { |
| 226 | /* |
| 227 | * If the 0x20 bit has come on, it could actually be because |
| 228 | * the operation succeeded, so check the done bit again. |
| 229 | */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 230 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 231 | data = FLASH0_READ (dev, addr); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 232 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 233 | if (((data ^ expect) & 0x80) == 0) { |
| 234 | rv = OK; |
| 235 | goto done; |
| 236 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 237 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 238 | printf ("flashWait: Program error (dev: %d, addr: 0x%x)\n", |
| 239 | DEV_NO (dev), addr); |
| 240 | |
| 241 | flashReset (dev); |
| 242 | rv = ERROR; |
| 243 | goto done; |
| 244 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 245 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 246 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 247 | printf ("flashWait: Timeout %s (dev: %d, addr: 0x%x)\n", |
| 248 | erase ? "erasing sector" : "programming byte", |
| 249 | DEV_NO (dev), addr); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 250 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 251 | done: |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 252 | |
| 253 | #if 0 |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 254 | PRINTF ("flashWait: rv=%d\n", rv); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 255 | #endif |
| 256 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 257 | return rv; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 258 | } |
| 259 | |
| 260 | /*********************************************************************** |
| 261 | * |
| 262 | * Public Flash Routines |
| 263 | * |
| 264 | ***********************************************************************/ |
| 265 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 266 | STATUS flashLibInit (void) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 267 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 268 | int i; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 269 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 270 | PRINTF ("flashLibInit: devices=%d\n", flashDevCount); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 271 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 272 | for (i = 0; i < flashDevCount; i++) { |
| 273 | flash_dev_t *dev = &flashDev[i]; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 274 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 275 | /* |
| 276 | * For bank 1, probe both without and with byte swappage, |
| 277 | * so that this module works on both old and new Mousse boards. |
| 278 | */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 279 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 280 | flashReset (dev); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 281 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 282 | if (flashProbe (dev) != ERROR) |
| 283 | dev->found = 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 284 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 285 | flashReset (dev); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 286 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 287 | if (flashProbe (dev) != ERROR) |
| 288 | dev->found = 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 289 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 290 | dev->swap = 0; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 291 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 292 | if (dev->found) { |
| 293 | PRINTF ("\n FLASH %s[%d]: iobase=0x%x - %d sectors %d KB", |
| 294 | flashDev[i].name, i, flashDev[i].base, |
| 295 | flashDev[i].sectors, |
| 296 | (flashDev[i].sectors * FLASH_SECTOR_SIZE) / 1024); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 297 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 298 | } |
| 299 | } |
| 300 | |
| 301 | flashLibInited = 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 302 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 303 | PRINTF ("flashLibInit: done\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 304 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 305 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 306 | } |
| 307 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 308 | STATUS flashEraseSector (flash_dev_t * dev, int sector) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 309 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 310 | int pos, addr; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 311 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 312 | PRINTF ("flashErasesector: dev=%d sector=%d\n", DEV_NO (dev), sector); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 313 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 314 | if (flashCheck (dev) == ERROR) |
| 315 | return ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 316 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 317 | if (sector < 0 || sector >= dev->sectors) { |
| 318 | printf ("flashEraseSector: Sector out of range (dev: %d, sector: %d)\n", DEV_NO (dev), sector); |
| 319 | return ERROR; |
| 320 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 321 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 322 | pos = FLASH_SECTOR_POS (dev, sector); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 323 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 324 | if (dev->bank != FLASH0_BANK) { |
| 325 | return ERROR; |
| 326 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 327 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 328 | addr = pos; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 329 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 330 | FLASH0_WRITE (dev, 0xaaa, 0xaa); |
| 331 | FLASH0_WRITE (dev, 0x555, 0x55); |
| 332 | FLASH0_WRITE (dev, 0xaaa, 0x80); |
| 333 | FLASH0_WRITE (dev, 0xaaa, 0xaa); |
| 334 | FLASH0_WRITE (dev, 0x555, 0x55); |
| 335 | FLASH0_WRITE (dev, addr, 0x30); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 336 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 337 | return flashWait (dev, addr, 0xff, 1); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 338 | } |
| 339 | |
| 340 | /* |
| 341 | * Note: it takes about as long to flash all sectors together with Chip |
| 342 | * Erase as it does to flash them one at a time (about 30 seconds for 2 |
| 343 | * MB). Also since we want to be able to treat subsets of sectors as if |
| 344 | * they were complete devices, we don't use Chip Erase. |
| 345 | */ |
| 346 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 347 | STATUS flashErase (flash_dev_t * dev) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 348 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 349 | int sector; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 350 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 351 | PRINTF ("flashErase: dev=%d sectors=%d\n", DEV_NO (dev), dev->sectors); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 352 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 353 | if (flashCheck (dev) == ERROR) |
| 354 | return ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 355 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 356 | for (sector = 0; sector < dev->sectors; sector++) { |
| 357 | if (flashEraseSector (dev, sector) == ERROR) |
| 358 | return ERROR; |
| 359 | } |
| 360 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 361 | } |
| 362 | |
| 363 | /* |
| 364 | * Read and write bytes |
| 365 | */ |
| 366 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 367 | STATUS flashRead (flash_dev_t * dev, int pos, char *buf, int len) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 368 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 369 | int addr, words; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 370 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 371 | PRINTF ("flashRead: dev=%d pos=0x%x buf=0x%x len=0x%x\n", |
| 372 | DEV_NO (dev), pos, (int) buf, len); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 373 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 374 | if (flashCheck (dev) == ERROR) |
| 375 | return ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 376 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 377 | if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) { |
| 378 | printf ("flashRead: Position out of range " |
| 379 | "(dev: %d, pos: 0x%x, len: 0x%x)\n", |
| 380 | DEV_NO (dev), pos, len); |
| 381 | return ERROR; |
| 382 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 383 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 384 | if (len == 0) |
| 385 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 386 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 387 | if (dev->bank == FLASH0_BANK) { |
| 388 | addr = pos; |
| 389 | words = len; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 390 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 391 | PRINTF ("flashRead: memcpy(0x%x, 0x%x, 0x%x)\n", |
| 392 | (int) buf, (int) FLASH0_ADDR (dev, pos), len); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 393 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 394 | memcpy (buf, FLASH0_ADDR (dev, addr), words); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 395 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 396 | } |
| 397 | PRINTF ("flashRead: rv=OK\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 398 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 399 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 400 | } |
| 401 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 402 | STATUS flashWrite (flash_dev_t * dev, int pos, char *buf, int len) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 403 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 404 | int addr, words; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 405 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 406 | PRINTF ("flashWrite: dev=%d pos=0x%x buf=0x%x len=0x%x\n", |
| 407 | DEV_NO (dev), pos, (int) buf, len); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 408 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 409 | if (flashCheck (dev) == ERROR) |
| 410 | return ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 411 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 412 | if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) { |
| 413 | printf ("flashWrite: Position out of range " |
| 414 | "(dev: %d, pos: 0x%x, len: 0x%x)\n", |
| 415 | DEV_NO (dev), pos, len); |
| 416 | return ERROR; |
| 417 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 418 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 419 | if (len == 0) |
| 420 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 421 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 422 | if (dev->bank == FLASH0_BANK) { |
| 423 | unsigned char tmp; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 424 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 425 | addr = pos; |
| 426 | words = len; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 427 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 428 | while (words--) { |
| 429 | tmp = *buf; |
| 430 | if (~FLASH0_READ (dev, addr) & tmp) { |
| 431 | printf ("flashWrite: Attempt to program 0 to 1 " |
| 432 | "(dev: %d, addr: 0x%x, data: 0x%x)\n", |
| 433 | DEV_NO (dev), addr, tmp); |
| 434 | return ERROR; |
| 435 | } |
| 436 | FLASH0_WRITE (dev, 0xaaa, 0xaa); |
| 437 | FLASH0_WRITE (dev, 0x555, 0x55); |
| 438 | FLASH0_WRITE (dev, 0xaaa, 0xa0); |
| 439 | FLASH0_WRITE (dev, addr, tmp); |
| 440 | if (flashWait (dev, addr, tmp, 0) < 0) |
| 441 | return ERROR; |
| 442 | buf++; |
| 443 | addr++; |
| 444 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 445 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 446 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 447 | PRINTF ("flashWrite: rv=OK\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 448 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 449 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 450 | } |
| 451 | |
| 452 | /* |
York Sun | 4a59809 | 2013-04-01 11:29:11 -0700 | [diff] [blame] | 453 | * flashWritable returns true if a range contains all F's. |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 454 | */ |
| 455 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 456 | STATUS flashWritable (flash_dev_t * dev, int pos, int len) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 457 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 458 | int addr, words; |
| 459 | int rv = ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 460 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 461 | PRINTF ("flashWritable: dev=%d pos=0x%x len=0x%x\n", |
| 462 | DEV_NO (dev), pos, len); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 463 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 464 | if (flashCheck (dev) == ERROR) |
| 465 | goto done; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 466 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 467 | if (pos < 0 || len < 0 || pos + len > FLASH_MAX_POS (dev)) { |
| 468 | printf ("flashWritable: Position out of range " |
| 469 | "(dev: %d, pos: 0x%x, len: 0x%x)\n", |
| 470 | DEV_NO (dev), pos, len); |
| 471 | goto done; |
| 472 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 473 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 474 | if (len == 0) { |
| 475 | rv = 1; |
| 476 | goto done; |
| 477 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 478 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 479 | if (dev->bank == FLASH0_BANK) { |
| 480 | addr = pos; |
| 481 | words = len; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 482 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 483 | while (words--) { |
| 484 | if (FLASH0_READ (dev, addr) != 0xff) { |
| 485 | rv = 0; |
| 486 | goto done; |
| 487 | } |
| 488 | addr++; |
| 489 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 490 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 491 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 492 | rv = 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 493 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 494 | done: |
| 495 | PRINTF ("flashWrite: rv=%d\n", rv); |
| 496 | return rv; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | |
| 500 | /* |
| 501 | * NOTE: the below code cannot run from FLASH!!! |
| 502 | */ |
| 503 | /*********************************************************************** |
| 504 | * |
| 505 | * Flash Diagnostics |
| 506 | * |
| 507 | ***********************************************************************/ |
| 508 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 509 | STATUS flashDiag (flash_dev_t * dev) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 510 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 511 | unsigned int *buf = 0; |
| 512 | int i, len, sector; |
| 513 | int rv = ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 514 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 515 | if (flashCheck (dev) == ERROR) |
| 516 | return ERROR; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 517 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 518 | printf ("flashDiag: Testing device %d, " |
| 519 | "base: 0x%x, %d sectors @ %d kB = %d kB\n", |
| 520 | DEV_NO (dev), dev->base, |
| 521 | dev->sectors, |
| 522 | 1 << (dev->lgSectorSize - 10), |
| 523 | dev->sectors << (dev->lgSectorSize - 10)); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 524 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 525 | len = 1 << dev->lgSectorSize; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 526 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 527 | printf ("flashDiag: Erasing\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 528 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 529 | if (flashErase (dev) == ERROR) { |
| 530 | printf ("flashDiag: Erase failed\n"); |
| 531 | goto done; |
| 532 | } |
| 533 | printf ("%d bytes requested ...\n", len); |
| 534 | buf = malloc (len); |
| 535 | printf ("allocated %d bytes ...\n", len); |
| 536 | if (buf == 0) { |
| 537 | printf ("flashDiag: Out of memory\n"); |
| 538 | goto done; |
| 539 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 540 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 541 | /* |
| 542 | * Write unique counting pattern to each sector |
| 543 | */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 544 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 545 | for (sector = 0; sector < dev->sectors; sector++) { |
| 546 | printf ("flashDiag: Write sector %d\n", sector); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 547 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 548 | for (i = 0; i < len / 4; i++) |
| 549 | buf[i] = sector << 24 | i; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 550 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 551 | if (flashWrite (dev, |
| 552 | sector << dev->lgSectorSize, |
| 553 | (char *) buf, len) == ERROR) { |
| 554 | printf ("flashDiag: Write failed (dev: %d, sector: %d)\n", |
| 555 | DEV_NO (dev), sector); |
| 556 | goto done; |
| 557 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 558 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 559 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 560 | /* |
| 561 | * Verify |
| 562 | */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 563 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 564 | for (sector = 0; sector < dev->sectors; sector++) { |
| 565 | printf ("flashDiag: Verify sector %d\n", sector); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 566 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 567 | if (flashRead (dev, |
| 568 | sector << dev->lgSectorSize, |
| 569 | (char *) buf, len) == ERROR) { |
| 570 | printf ("flashDiag: Read failed (dev: %d, sector: %d)\n", |
| 571 | DEV_NO (dev), sector); |
| 572 | goto done; |
| 573 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 574 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 575 | for (i = 0; i < len / 4; i++) { |
| 576 | if (buf[i] != (sector << 24 | i)) { |
| 577 | printf ("flashDiag: Verify error " |
| 578 | "(dev: %d, sector: %d, offset: 0x%x)\n", |
| 579 | DEV_NO (dev), sector, i); |
| 580 | printf ("flashDiag: Expected 0x%08x, got 0x%08x\n", |
| 581 | sector << 24 | i, buf[i]); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 582 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 583 | goto done; |
| 584 | } |
| 585 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 586 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 587 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 588 | printf ("flashDiag: Erasing\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 589 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 590 | if (flashErase (dev) == ERROR) { |
| 591 | printf ("flashDiag: Final erase failed\n"); |
| 592 | goto done; |
| 593 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 594 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 595 | rv = OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 596 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 597 | done: |
| 598 | if (buf) |
| 599 | free (buf); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 600 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 601 | if (rv == OK) |
| 602 | printf ("flashDiag: Device %d passed\n", DEV_NO (dev)); |
| 603 | else |
| 604 | printf ("flashDiag: Device %d failed\n", DEV_NO (dev)); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 605 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 606 | return rv; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 607 | } |
| 608 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 609 | STATUS flashDiagAll (void) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 610 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 611 | int i; |
| 612 | int rv = OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 613 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 614 | PRINTF ("flashDiagAll: devices=%d\n", flashDevCount); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 615 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 616 | for (i = 0; i < flashDevCount; i++) { |
| 617 | flash_dev_t *dev = &flashDev[i]; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 618 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 619 | if (dev->found && flashDiag (dev) == ERROR) |
| 620 | rv = ERROR; |
| 621 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 622 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 623 | if (rv == OK) |
| 624 | printf ("flashDiagAll: Passed\n"); |
| 625 | else |
| 626 | printf ("flashDiagAll: Failed because of earlier errors\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 627 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 628 | return OK; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 629 | } |
| 630 | |
| 631 | |
| 632 | /*----------------------------------------------------------------------- |
| 633 | */ |
| 634 | unsigned long flash_init (void) |
| 635 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 636 | unsigned long size = 0; |
| 637 | flash_dev_t *dev = NULL; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 638 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 639 | flashLibInit (); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 640 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 641 | /* |
| 642 | * Provide info for FLASH (up to 960K) of Kernel Image data. |
| 643 | */ |
| 644 | dev = FLASH_DEV_BANK0_LOW; |
| 645 | flash_info[FLASH_BANK_KERNEL].flash_id = |
| 646 | (dev->vendorID << 16) | dev->deviceID; |
| 647 | flash_info[FLASH_BANK_KERNEL].sector_count = dev->sectors; |
| 648 | flash_info[FLASH_BANK_KERNEL].size = |
| 649 | flash_info[FLASH_BANK_KERNEL].sector_count * FLASH_SECTOR_SIZE; |
| 650 | flash_info[FLASH_BANK_KERNEL].start[FIRST_SECTOR] = dev->base; |
| 651 | size += flash_info[FLASH_BANK_KERNEL].size; |
| 652 | |
| 653 | /* |
| 654 | * Provide info for 512K PLCC FLASH ROM (U-Boot) |
| 655 | */ |
| 656 | dev = FLASH_DEV_BANK0_BOOT; |
| 657 | flash_info[FLASH_BANK_BOOT].flash_id = |
| 658 | (dev->vendorID << 16) | dev->deviceID; |
| 659 | flash_info[FLASH_BANK_BOOT].sector_count = dev->sectors; |
| 660 | flash_info[FLASH_BANK_BOOT].size = |
| 661 | flash_info[FLASH_BANK_BOOT].sector_count * FLASH_SECTOR_SIZE; |
| 662 | flash_info[FLASH_BANK_BOOT].start[FIRST_SECTOR] = dev->base; |
| 663 | size += flash_info[FLASH_BANK_BOOT].size; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 664 | |
| 665 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 666 | /* |
| 667 | * Provide info for 512K FLASH0 segment (U-Boot) |
| 668 | */ |
| 669 | dev = FLASH_DEV_BANK0_HIGH; |
| 670 | flash_info[FLASH_BANK_AUX].flash_id = |
| 671 | (dev->vendorID << 16) | dev->deviceID; |
| 672 | flash_info[FLASH_BANK_AUX].sector_count = dev->sectors; |
| 673 | flash_info[FLASH_BANK_AUX].size = |
| 674 | flash_info[FLASH_BANK_AUX].sector_count * FLASH_SECTOR_SIZE; |
| 675 | flash_info[FLASH_BANK_AUX].start[FIRST_SECTOR] = dev->base; |
| 676 | size += flash_info[FLASH_BANK_AUX].size; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 677 | |
| 678 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 679 | return size; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 680 | } |
| 681 | |
| 682 | /* |
| 683 | * Get flash device from U-Boot flash info. |
| 684 | */ |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 685 | flash_dev_t *getFlashDevFromInfo (flash_info_t * info) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 686 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 687 | int i; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 688 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 689 | if (!info) |
| 690 | return NULL; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 691 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 692 | for (i = 0; i < flashDevCount; i++) { |
| 693 | flash_dev_t *dev = &flashDev[i]; |
| 694 | |
| 695 | if (dev->found && (dev->base == info->start[0])) |
| 696 | return dev; |
| 697 | } |
| 698 | printf ("ERROR: notice, no FLASH mapped at address 0x%x\n", |
| 699 | (unsigned int) info->start[0]); |
| 700 | return NULL; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 701 | } |
| 702 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 703 | ulong flash_get_size (vu_long * addr, flash_info_t * info) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 704 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 705 | int i; |
| 706 | |
| 707 | for (i = 0; i < flashDevCount; i++) { |
| 708 | flash_dev_t *dev = &flashDev[i]; |
| 709 | |
| 710 | if (dev->found) { |
| 711 | if (dev->base == (unsigned int) addr) { |
| 712 | info->flash_id = (dev->vendorID << 16) | dev->deviceID; |
| 713 | info->sector_count = dev->sectors; |
| 714 | info->size = info->sector_count * FLASH_SECTOR_SIZE; |
| 715 | return dev->sectors * FLASH_SECTOR_SIZE; |
| 716 | } |
| 717 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 718 | } |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 719 | return 0; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 720 | } |
| 721 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 722 | void flash_print_info (flash_info_t * info) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 723 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 724 | int i; |
| 725 | unsigned int chip; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 726 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 727 | if (info->flash_id == FLASH_UNKNOWN) { |
| 728 | printf ("missing or unknown FLASH type\n"); |
| 729 | return; |
| 730 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 731 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 732 | switch ((info->flash_id >> 16) & 0xff) { |
| 733 | case 0x1: |
| 734 | printf ("AMD "); |
| 735 | break; |
| 736 | default: |
| 737 | printf ("Unknown Vendor "); |
| 738 | break; |
| 739 | } |
| 740 | chip = (unsigned int) info->flash_id & 0x000000ff; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 741 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 742 | switch (chip) { |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 743 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 744 | case AMD_ID_F040B: |
| 745 | printf ("AM29F040B (4 Mbit)\n"); |
| 746 | break; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 747 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 748 | case AMD_ID_LV160B: |
| 749 | case FLASH_AM160LV: |
| 750 | case 0x49: |
| 751 | printf ("AM29LV160B (16 Mbit / 2M x 8bit)\n"); |
| 752 | break; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 753 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 754 | default: |
| 755 | printf ("Unknown Chip Type:0x%x\n", chip); |
| 756 | break; |
| 757 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 758 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 759 | printf (" Size: %ld bytes in %d Sectors\n", |
| 760 | info->size, info->sector_count); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 761 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 762 | printf (" Sector Start Addresses:"); |
| 763 | for (i = 0; i < info->sector_count; ++i) { |
| 764 | if ((i % 5) == 0) |
| 765 | printf ("\n "); |
| 766 | printf (" %08lX%s", |
| 767 | info->start[FIRST_SECTOR] + i * FLASH_SECTOR_SIZE, |
| 768 | info->protect[i] ? " (RO)" : " "); |
| 769 | } |
| 770 | printf ("\n"); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 771 | } |
| 772 | |
| 773 | |
| 774 | /* |
| 775 | * Erase a range of flash sectors. |
| 776 | */ |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 777 | int flash_erase (flash_info_t * info, int s_first, int s_last) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 778 | { |
Wolfgang Denk | e3e3e97a6 | 2011-11-05 05:13:00 +0000 | [diff] [blame] | 779 | int prot, sect; |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 780 | flash_dev_t *dev = NULL; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 781 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 782 | if ((s_first < 0) || (s_first > s_last)) { |
| 783 | if (info->flash_id == FLASH_UNKNOWN) { |
| 784 | printf ("- missing\n"); |
| 785 | } else { |
| 786 | printf ("- no sectors to erase\n"); |
| 787 | } |
| 788 | return 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 789 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 790 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 791 | prot = 0; |
| 792 | for (sect = s_first; sect <= s_last; sect++) { |
| 793 | if (info->protect[sect]) { |
| 794 | prot++; |
| 795 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 796 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 797 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 798 | if (prot) { |
| 799 | printf ("- Warning: %d protected sectors will not be erased!\n", |
| 800 | prot); |
| 801 | } else { |
| 802 | printf ("\n"); |
| 803 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 804 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 805 | /* Start erase on unprotected sectors */ |
| 806 | dev = getFlashDevFromInfo (info); |
| 807 | if (dev) { |
| 808 | printf ("Erase FLASH[%s] -%d sectors:", dev->name, dev->sectors); |
| 809 | for (sect = s_first; sect <= s_last; sect++) { |
| 810 | if (info->protect[sect] == 0) { /* not protected */ |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 811 | printf ("."); |
| 812 | if (ERROR == flashEraseSector (dev, sect)) { |
| 813 | printf ("ERROR: could not erase sector %d on FLASH[%s]\n", sect, dev->name); |
| 814 | return 1; |
| 815 | } |
| 816 | } |
| 817 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 818 | } |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 819 | printf (" done\n"); |
| 820 | return 0; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 821 | } |
| 822 | |
| 823 | /*----------------------------------------------------------------------- |
| 824 | * Write a word to Flash, returns: |
| 825 | * 0 - OK |
| 826 | * 1 - write timeout |
| 827 | * 2 - Flash not erased |
| 828 | */ |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 829 | static int write_word (flash_info_t * info, ulong dest, ulong data) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 830 | { |
| 831 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 832 | flash_dev_t *dev = getFlashDevFromInfo (info); |
| 833 | int addr = dest - info->start[0]; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 834 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 835 | if (!dev) |
| 836 | return 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 837 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 838 | if (OK != flashWrite (dev, addr, (char *) &data, sizeof (ulong))) { |
| 839 | printf ("ERROR: could not write to addr=0x%x, data=0x%x\n", |
| 840 | (unsigned int) addr, (unsigned) data); |
| 841 | return 1; |
| 842 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 843 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 844 | if ((addr % FLASH_SECTOR_SIZE) == 0) |
| 845 | printf ("."); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 846 | |
| 847 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 848 | PRINTF ("write_word:0x%x, base=0x%x, addr=0x%x, data=0x%x\n", |
| 849 | (unsigned) info->start[0], |
| 850 | (unsigned) dest, |
| 851 | (unsigned) (dest - info->start[0]), (unsigned) data); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 852 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 853 | return (0); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 854 | } |
| 855 | |
| 856 | |
| 857 | /*----------------------------------------------------------------------- |
| 858 | * Copy memory to flash, returns: |
| 859 | * 0 - OK |
| 860 | * 1 - write timeout |
| 861 | * 2 - Flash not erased |
| 862 | */ |
| 863 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 864 | int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 865 | { |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 866 | ulong cp, wp, data; |
| 867 | int i, l, rc; |
| 868 | flash_dev_t *dev = getFlashDevFromInfo (info); |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 869 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 870 | if (dev) { |
| 871 | printf ("FLASH[%s]:", dev->name); |
| 872 | wp = (addr & ~3); /* get lower word aligned address */ |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 873 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 874 | /* |
| 875 | * handle unaligned start bytes |
| 876 | */ |
| 877 | if ((l = addr - wp) != 0) { |
| 878 | data = 0; |
| 879 | for (i = 0, cp = wp; i < l; ++i, ++cp) { |
| 880 | data = (data << 8) | (*(uchar *) cp); |
| 881 | } |
| 882 | for (; i < 4 && cnt > 0; ++i) { |
| 883 | data = (data << 8) | *src++; |
| 884 | --cnt; |
| 885 | ++cp; |
| 886 | } |
| 887 | for (; cnt == 0 && i < 4; ++i, ++cp) { |
| 888 | data = (data << 8) | (*(uchar *) cp); |
| 889 | } |
| 890 | if ((rc = write_word (info, wp, data)) != 0) { |
| 891 | return (rc); |
| 892 | } |
| 893 | wp += 4; |
| 894 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 895 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 896 | /* |
| 897 | * handle word aligned part |
| 898 | */ |
| 899 | while (cnt >= 4) { |
| 900 | data = 0; |
| 901 | for (i = 0; i < 4; ++i) { |
| 902 | data = (data << 8) | *src++; |
| 903 | } |
| 904 | if ((rc = write_word (info, wp, data)) != 0) { |
| 905 | return (rc); |
| 906 | } |
| 907 | wp += 4; |
| 908 | cnt -= 4; |
| 909 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 910 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 911 | if (cnt == 0) { |
| 912 | return (0); |
| 913 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 914 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 915 | /* |
| 916 | * handle unaligned tail bytes |
| 917 | */ |
| 918 | data = 0; |
| 919 | for (i = 0, cp = wp; i < 4 && cnt > 0; ++i, ++cp) { |
| 920 | data = (data << 8) | *src++; |
| 921 | --cnt; |
| 922 | } |
| 923 | for (; i < 4; ++i, ++cp) { |
| 924 | data = (data << 8) | (*(uchar *) cp); |
| 925 | } |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 926 | |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 927 | return (write_word (info, wp, data)); |
| 928 | } |
| 929 | return 1; |
wdenk | cc1c8a1 | 2002-11-02 22:58:18 +0000 | [diff] [blame] | 930 | } |
| 931 | |
| 932 | /*----------------------------------------------------------------------- |
| 933 | */ |