summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-03-01 17:00:49 +0100
committerStefan Roese <sr@denx.de>2006-03-01 17:00:49 +0100
commitf18e874ad548034552cc4a2cdfe1a21edd9ca392 (patch)
tree3598ced185b1fc9460e028f15468d434c03a3a20
parentf6c0068fc1181dc6b6081addd84ee1cfc0a4977b (diff)
Fix problem with flash_get_size() from CFI driver update
Patch by Stefan Roese, 1 Mar 2006
-rw-r--r--CHANGELOG3
-rw-r--r--board/mcc200/mcc200.c2
-rw-r--r--board/tqm85xx/tqm85xx.c1
-rw-r--r--drivers/cfi_flash.c1
-rw-r--r--include/flash.h1
5 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index baa9537cb92..8e9115eb75b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix problem with flash_get_size() from CFI driver update
+ Patch by Stefan Roese, 1 Mar 2006
+
* Convert mcc200 to use common CFI flash driver
Patch by Stefan Roese, 28 Feb 2006
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 47073907e17..acc0e06862d 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -38,6 +38,8 @@
extern flash_info_t flash_info[]; /* FLASH chips info */
+ulong flash_get_size (ulong base, int banknum);
+
//###CHD: wenn RAMBOOT gehen wuerde, ....
#ifndef CFG_RAMBOOT
static void sdram_start (int hi_addr)
diff --git a/board/tqm85xx/tqm85xx.c b/board/tqm85xx/tqm85xx.c
index b36beadea78..c03b60d11a7 100644
--- a/board/tqm85xx/tqm85xx.c
+++ b/board/tqm85xx/tqm85xx.c
@@ -40,6 +40,7 @@ extern flash_info_t flash_info[]; /* FLASH chips info */
void local_bus_init (void);
long int fixed_sdram (void);
+ulong flash_get_size (ulong base, int banknum);
#ifdef CONFIG_CPM2
/*
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index df17da5eafb..ff4d85f3f0d 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -203,6 +203,7 @@ static int flash_detect_cfi (flash_info_t * info);
static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
ulong tout, char *prompt);
+ulong flash_get_size (ulong base, int banknum);
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base);
#endif
diff --git a/include/flash.h b/include/flash.h
index 91087233664..84931917897 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -80,7 +80,6 @@ extern void flash_print_info (flash_info_t *);
extern int flash_erase (flash_info_t *, int, int);
extern int flash_sect_erase (ulong addr_first, ulong addr_last);
extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last);
-extern ulong flash_get_size (ulong base, int banknum);
/* common/flash.c */
extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info);