GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-29 10:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

Browse source
This commit is contained in:
Wolfgang Denk 2009-02-11 22:24:51 +01:00
commit c50a603167
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/cfi_flash.c
View file

@ -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) #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; int i;
flash_info_t * info = 0; flash_info_t * info = 0;

3
include/flash.h
View file

@ -124,6 +124,9 @@ extern int jedec_flash_match(flash_info_t *info, ulong base);
#define CFI_CMDSET_AMD_LEGACY 0xFFF0 #define CFI_CMDSET_AMD_LEGACY 0xFFF0
#endif #endif
#if defined(CONFIG_SYS_FLASH_CFI)
extern flash_info_t *flash_get_info(ulong base);
#endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* return codes from flash_write(): * return codes from flash_write():