From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 16 Dec 2016 12:46:20 +0000 (+0100)
Subject: ARM: zynq: Remove ZYNQ_M29EW_WB_HACK macro
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=909f87226060684cc6ac0337f0be91b0e4c02a43;p=thirdparty%2Fu-boot.git

ARM: zynq: Remove ZYNQ_M29EW_WB_HACK macro

This functionality should be covered by:
"mtd: cfi_flash: Write buffer size adjustment for M29EW Numonyx devices"
(sha1: 6f13889eb03fd3ce7b643aa6134856b3a2bf8d88)

That's why remove this macro and hack.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 3f0dafee931..74365c4927e 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -52,9 +52,6 @@ config BOOT_INIT_FILE
 	  Expect a table of register-value pairs, e.g. "0x12345678 0x4321"
 
 # Temporary Kconfig options which needs to be fixed
-config ZYNQ_M29EW_WB_HACK
-	bool
-
 config SYS_I2C_MUX_ADDR
 	int
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 9d7c5dd8638..33c4a9342f8 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2237,10 +2237,6 @@ ulong flash_get_size (phys_addr_t base, int banknum)
 		}
 
 		info->sector_count = sect_cnt;
-		/* FIXME */
-#ifdef CONFIG_ZYNQ_M29EW_WB_HACK
-		qry.max_buf_write_size = 0x8;
-#endif
 		info->buffer_size = 1 << le16_to_cpu(qry.max_buf_write_size);
 		tmp = 1 << qry.block_erase_timeout_typ;
 		info->erase_blk_tout = tmp *
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 7803ff64073..f1631cd10f7 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -73,7 +73,6 @@
 # define CONFIG_FLASH_CFI_DRIVER
 # undef CONFIG_SYS_FLASH_PROTECTION
 # define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-# define CONFIG_ZYNQ_M29EW_WB_HACK
 #endif
 
 /* MMC */