diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-22 10:37:39 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-22 10:38:31 +0200 |
commit | 713285ca19f39e9a48598416ccab222105acf708 (patch) | |
tree | dddd4b2a46809b0417c5f7eee83987b8af653add /drivers/mtd/nor | |
parent | 9746f02caed759f9ec0fcf4c9e8417d86af5a796 (diff) | |
download | barebox-713285ca19f39e9a48598416ccab222105acf708.tar.gz barebox-713285ca19f39e9a48598416ccab222105acf708.tar.xz |
mtd: cfi-flash: remove dead code
CFG_FLASH_PROTECTION is never defined, remove the code. Also
remove code inside #if 0.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nor')
-rw-r--r-- | drivers/mtd/nor/cfi_flash.c | 36 | ||||
-rw-r--r-- | drivers/mtd/nor/cfi_flash.h | 6 | ||||
-rw-r--r-- | drivers/mtd/nor/cfi_flash_intel.c | 6 |
3 files changed, 0 insertions, 48 deletions
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index b93c663b88..f9aecadb5a 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -308,9 +308,6 @@ static int flash_detect_size(struct flash_info *info) info->ext_addr = 0; info->cfi_version = 0; -#ifdef CFG_FLASH_PROTECTION - info->legacy_unlock = 0; -#endif /* first only malloc space for the first sector */ info->start = xmalloc(sizeof(*info->eraseregions)); @@ -763,39 +760,6 @@ static void cfi_info (struct device_d* dev) return; } -#if 0 -/* - * flash_read_user_serial - read the OneTimeProgramming cells - */ -static void flash_read_user_serial (struct flash_info *info, void *buffer, int offset, - int len) -{ - uchar *src; - uchar *dst; - - dst = buffer; - src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION); - flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); - memcpy (dst, src + offset, len); - flash_write_cmd (info, 0, 0, info->cmd_reset); -} - -/* - * flash_read_factory_serial - read the device Id from the protection area - */ -static void flash_read_factory_serial (struct flash_info *info, void *buffer, int offset, - int len) -{ - uchar *src; - - src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION); - flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID); - memcpy (buffer, src + offset, len); - flash_write_cmd (info, 0, 0, info->cmd_reset); -} - -#endif - int flash_status_check(struct flash_info *info, flash_sect_t sector, u64 tout, char *prompt) { diff --git a/drivers/mtd/nor/cfi_flash.h b/drivers/mtd/nor/cfi_flash.h index 6d975b94e2..e82eb28abe 100644 --- a/drivers/mtd/nor/cfi_flash.h +++ b/drivers/mtd/nor/cfi_flash.h @@ -355,12 +355,6 @@ extern void flash_protect(int flag, unsigned long from, unsigned long to, struct flash_info *info); extern int flash_write(char *, unsigned long, unsigned long); -#if defined(CFG_FLASH_PROTECTION) -extern int flash_real_protect(struct flash_info *info, long sector, int prot); -extern void flash_read_user_serial(struct flash_info *info, void *buffer, int offset, int len); -extern void flash_read_factory_serial(struct flash_info *info, void *buffer, int offset, int len); -#endif /* CFG_FLASH_PROTECTION */ - /*----------------------------------------------------------------------- * Protection Flags for flash_protect(): */ diff --git a/drivers/mtd/nor/cfi_flash_intel.c b/drivers/mtd/nor/cfi_flash_intel.c index 835734df36..6108d7cc62 100644 --- a/drivers/mtd/nor/cfi_flash_intel.c +++ b/drivers/mtd/nor/cfi_flash_intel.c @@ -154,12 +154,6 @@ static int intel_flash_real_protect(struct flash_info *info, long sector, int pr static void intel_flash_fixup(struct flash_info *info, struct cfi_qry *qry) { -#ifdef CFG_FLASH_PROTECTION - /* read legacy lock/unlock bit from intel flash */ - if (info->ext_addr) - info->legacy_unlock = flash_read_uchar(info, - info->ext_addr + 5) & 0x08; -#endif } struct cfi_cmd_set cfi_cmd_set_intel = { |