mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
Merge git://www.denx.de/git/u-boot-cfi-flash
This commit is contained in:
commit
c2150e4dc1
3 changed files with 4 additions and 11 deletions
|
@ -178,7 +178,7 @@ __maybe_weak u64 flash_read64(void *addr)
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
#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)
|
||||||
flash_info_t *flash_get_info(ulong base)
|
static flash_info_t *flash_get_info(ulong base)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
flash_info_t *info;
|
flash_info_t *info;
|
||||||
|
@ -355,7 +355,7 @@ static ulong flash_read_long (flash_info_t * info, flash_sect_t sect,
|
||||||
/*
|
/*
|
||||||
* Write a proper sized command to the correct address
|
* Write a proper sized command to the correct address
|
||||||
*/
|
*/
|
||||||
void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
|
static void flash_write_cmd(flash_info_t *info, flash_sect_t sect,
|
||||||
uint offset, u32 cmd)
|
uint offset, u32 cmd)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -2298,7 +2298,7 @@ static void cfi_flash_set_config_reg(u32 base, u16 val)
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void flash_protect_default(void)
|
static void flash_protect_default(void)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
|
#if defined(CONFIG_SYS_FLASH_AUTOPROTECT_LIST)
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -81,7 +81,6 @@ typedef unsigned long flash_sect_t;
|
||||||
/* Prototypes */
|
/* Prototypes */
|
||||||
|
|
||||||
extern unsigned long flash_init (void);
|
extern unsigned long flash_init (void);
|
||||||
extern void flash_protect_default(void);
|
|
||||||
extern void flash_print_info (flash_info_t *);
|
extern void flash_print_info (flash_info_t *);
|
||||||
extern int flash_erase (flash_info_t *, int, int);
|
extern int flash_erase (flash_info_t *, int, int);
|
||||||
extern int flash_sect_erase (ulong addr_first, ulong addr_last);
|
extern int flash_sect_erase (ulong addr_first, ulong addr_last);
|
||||||
|
@ -114,10 +113,6 @@ 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():
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -165,8 +165,6 @@ extern int cfi_flash_num_flash_banks;
|
||||||
#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS
|
#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void flash_write_cmd(flash_info_t * info, flash_sect_t sect,
|
|
||||||
uint offset, u32 cmd);
|
|
||||||
phys_addr_t cfi_flash_bank_addr(int i);
|
phys_addr_t cfi_flash_bank_addr(int i);
|
||||||
unsigned long cfi_flash_bank_size(int i);
|
unsigned long cfi_flash_bank_size(int i);
|
||||||
void flash_cmd_reset(flash_info_t *info);
|
void flash_cmd_reset(flash_info_t *info);
|
||||||
|
|
Loading…
Add table
Reference in a new issue