Merge with /home/sr/git/u-boot/cfi-flash-fix

diff --git a/CHANGELOG b/CHANGELOG
index 2e0a957a665be5fe4e9781b4ef4b98963e72ffc2..85ae3efbd55c84e90b87b1e8b77a6bacf38574be 100644 (file)
--- 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
+
 * Make CFG_NO_FLASH work on ARM systems
   Patch by Markus Klotzbuecher, 27 Feb 2006
 

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 47073907e178f8a5dbf2c9a83e90665e66e5ef37..acc0e06862df63e1cc12678d7b7b56fe7b65ab2d 100644 (file)
--- 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 b36beadea789a5b34dbba2db19ffeff50710d32b..c03b60d11a7ab01652413dcdfe4c81407c307052 100644 (file)
--- 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 df17da5eafb40e624271efbf48aac6ee269d04f3..ff4d85f3f0dd60f1edc0c00516092fe7dc78e42f 100644 (file)
--- 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 91087233664cc8681d9fb3372c357c6160cf4f8e..849319178973600ff24c985b8246e776612ecd7e 100644 (file)
--- 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);