diff options
| author | wdenk <wdenk> | 2003-10-06 21:55:32 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-10-06 21:55:32 +0000 |
| commit | fbe4b5cbdea438ccec0d93de443f367f3ba46196 (patch) | |
| tree | 7a0a65dbae5217950bcc6301a435a074263fa0a7 /include | |
| parent | bb65a312675f3cd1923a5cbe325ad9ca1703fc58 (diff) | |
| download | blackbird-obmc-uboot-fbe4b5cbdea438ccec0d93de443f367f3ba46196.tar.gz blackbird-obmc-uboot-fbe4b5cbdea438ccec0d93de443f367f3ba46196.zip | |
* Update TRAB auto update code
* Make fatload set filesize environment variable
fix potential buffer overlow problem
* enable basic / medium / high-end configurations for PPChameleonEVB
board; fix NAND code
* enable TFTP client code to specify to the server the desired
timeout value (see RFC-2349)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/PPChameleonEVB.h | 37 | ||||
| -rw-r--r-- | include/image.h | 1 |
2 files changed, 23 insertions, 15 deletions
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 7c7b98ceb4..1630bc32b1 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -1,9 +1,12 @@ /* - * (C) Copyright 2001-2003 - * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com + * (C) Copyright 2003 + * DAVE Srl * - * See file CREDITS for list of people who contributed to this - * project. + * http://www.dave-tech.it + * http://www.wawnet.biz + * mailto:info@wawnet.biz + * + * Credits: Stefan Roese, Wolfgang Denk * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -28,6 +31,13 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_PPCHAMELEON_MODULE_BA 0 /* Basic Model */ +#define CONFIG_PPCHAMELEON_MODULE_ME 1 /* Medium Model */ +#define CONFIG_PPCHAMELEON_MODULE_HI 2 /* High-End Model */ +#ifndef CONFIG_PPCHAMELEON_MODULE_MODEL +#define CONFIG_PPCHAMELEON_MODULE_MODEL CONFIG_PPCHAMELEON_MODULE_BA +#endif + /* * Debug stuff */ @@ -150,6 +160,7 @@ #define CFG_MAX_NAND_DEVICE 2 /* Max number of NAND devices */ #define SECTORSIZE 512 +#define NAND_NO_RB #define ADDR_COLUMN 1 #define ADDR_PAGE 2 @@ -248,19 +259,15 @@ } \ } while(0) +#ifdef NAND_NO_RB +/* constant delay (see also tR in the datasheet) */ #define NAND_WAIT_READY(nand) do { \ - ulong mask = 0; \ - switch ((ulong)(((struct nand_chip *)nand)->IO_ADDR)) { \ - case CFG_NAND0_BASE: \ - mask = CFG_NAND0_RDY; \ - break; \ - case CFG_NAND1_BASE: \ - mask = CFG_NAND1_RDY; \ - break; \ - } \ - while (!(in32(GPIO0_IR) & mask)) \ - ; \ + udelay(12); \ } while (0) +#else +/* use the R/B pin */ +/* TBD */ +#endif #define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)(d); } while(0) #define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)(d); } while(0) diff --git a/include/image.h b/include/image.h index b93d1041f9..9c6f95b054 100644 --- a/include/image.h +++ b/include/image.h @@ -112,6 +112,7 @@ #define IH_TYPE_MULTI 4 /* Multi-File Image */ #define IH_TYPE_FIRMWARE 5 /* Firmware Image */ #define IH_TYPE_SCRIPT 6 /* Script file */ +#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ /* * Compression Types |
