From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 6 Feb 2013 06:57:46 +0000 (+0100)
Subject: sf: Do not use SZ_16M for Microblaze
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52234d42ea22bf1ed2121bdabeaf134f74fa98f5;p=thirdparty%2Fu-boot.git

sf: Do not use SZ_16M for Microblaze

Microblaze doesn't define asm/sizes.h that's why SZ_16M
can't be used. Use direct value instead.

This should be the part of this patch.
"sf: Add bank address access support"
(sha1: 5b00fc8b7fbf422bdc18de2bfa414db38026094f)

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

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 7bc4322d83a..bf3eae6059a 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -12,7 +12,6 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <watchdog.h>
-#include <asm/sizes.h>
 
 #include "spi_flash_internal.h"
 
@@ -36,14 +35,14 @@ static int spi_flash_check_bankaddr_access(struct spi_flash *flash, u32 *offset)
 {
 	int ret;
 
-	if (*offset >= SZ_16M) {
+	if (*offset >= 0x1000000) {
 		ret = spi_flash_bankaddr_access(flash, STATUS_BANKADDR_ENABLE);
 		if (ret) {
 			debug("SF: fail to %s bank addr bit\n",
 				STATUS_BANKADDR_ENABLE ? "set" : "reset");
 			return ret;
 		}
-		*offset -= SZ_16M;
+		*offset -= 0x1000000;
 	} else {
 		ret = spi_flash_bankaddr_access(flash, STATUS_BANKADDR_DISABLE);
 		if (ret) {
@@ -106,7 +105,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
 	int ret;
 	u8 cmd[flash->addr_width+1];
 
-	if ((flash->size > SZ_16M) && (flash->addr_width == 3)) {
+	if ((flash->size > 0x1000000) && (flash->addr_width == 3)) {
 		ret = spi_flash_check_bankaddr_access(flash, &offset);
 		if (ret) {
 			debug("SF: fail to acess bank_addr\n");
@@ -184,7 +183,7 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset,
 	u8 cmd[flash->addr_width+2];
 	int ret;
 
-	if ((flash->size > SZ_16M) && (flash->addr_width == 3)) {
+	if ((flash->size > 0x1000000) && (flash->addr_width == 3)) {
 		ret = spi_flash_check_bankaddr_access(flash, &offset);
 		if (ret) {
 			debug("SF: fail to acess bank_addr\n");
@@ -253,7 +252,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 	unsigned long page_addr;
 	u8 cmd[flash->addr_width+1];
 
-	if ((flash->size > SZ_16M) && (flash->addr_width == 3)) {
+	if ((flash->size > 0x1000000) && (flash->addr_width == 3)) {
 		ret = spi_flash_check_bankaddr_access(flash, &offset);
 		if (ret) {
 			debug("SF: fail to acess bank_addr\n");