diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-11 22:24:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-11 22:24:51 +0100 |
| commit | c50a6031670a90f799835db7bc1638a3e2a9f1f0 (patch) | |
| tree | 01ce596bae07afb0c76f6e2e26aa17e4e3f2ca0c | |
| parent | 86321fc1128c93a10ac4afb9d317b0df8ece0f9e (diff) | |
| parent | 4f975678de995b55749d5e84590c268972a7c835 (diff) | |
| download | blackbird-obmc-uboot-c50a6031670a90f799835db7bc1638a3e2a9f1f0.tar.gz blackbird-obmc-uboot-c50a6031670a90f799835db7bc1638a3e2a9f1f0.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 2 | ||||
| -rw-r--r-- | include/flash.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 04a9a92586..a66feac14f 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -273,7 +273,7 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); /*----------------------------------------------------------------------- */ #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) -static flash_info_t *flash_get_info(ulong base) +flash_info_t *flash_get_info(ulong base) { int i; flash_info_t * info = 0; diff --git a/include/flash.h b/include/flash.h index 02c6a04314..8b8979e2f7 100644 --- a/include/flash.h +++ b/include/flash.h @@ -124,6 +124,9 @@ extern int jedec_flash_match(flash_info_t *info, ulong base); #define CFI_CMDSET_AMD_LEGACY 0xFFF0 #endif +#if defined(CONFIG_SYS_FLASH_CFI) +extern flash_info_t *flash_get_info(ulong base); +#endif /*----------------------------------------------------------------------- * return codes from flash_write(): |
