mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
This commit is contained in:
commit
c50a603167
2 changed files with 4 additions and 1 deletions
|
@ -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;
|
||||
|
|
|
@ -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():
|
||||
|
|
Loading…
Add table
Reference in a new issue