diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-26 22:10:35 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-26 22:10:35 +0300 |
| commit | c2150e4dc1b35dd7654103f1d4f8abc63a9a1cfc (patch) | |
| tree | e509d140c7b64c0505f14f26bd8813ec225df025 /include | |
| parent | 5c27535dc9a0a4858cb3efad2400ffe83c678441 (diff) | |
| parent | 236c49a1c89f959e0b96c87a712688ba93abd3c4 (diff) | |
| download | u-boot-c2150e4dc1b35dd7654103f1d4f8abc63a9a1cfc.tar.xz | |
Merge git://www.denx.de/git/u-boot-cfi-flash
Diffstat (limited to 'include')
| -rw-r--r-- | include/flash.h | 5 | ||||
| -rw-r--r-- | include/mtd/cfi_flash.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/flash.h b/include/flash.h index 55c5bdd4b1..f53fe91349 100644 --- a/include/flash.h +++ b/include/flash.h @@ -81,7 +81,6 @@ typedef unsigned long flash_sect_t; /* Prototypes */ extern unsigned long flash_init (void); -extern void flash_protect_default(void); 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); @@ -114,10 +113,6 @@ 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(): */ diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index 52572b9b02..eade2b3614 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -165,8 +165,6 @@ extern int cfi_flash_num_flash_banks; #define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS #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); unsigned long cfi_flash_bank_size(int i); void flash_cmd_reset(flash_info_t *info); |