--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1107,6 +1107,9 @@ static int __xipram do_write_oneword(str
 	int retry_cnt = 0;
 
 	adr += chip->start;
+#ifdef CONFIG_AMAZON
+	adr ^= 2;
+#endif
 
 	spin_lock(chip->mutex);
 	ret = get_chip(map, chip, adr, FL_WRITING);
@@ -1389,7 +1392,11 @@ static int __xipram do_write_buffer(stru
 	z = 0;
 	while(z < words * map_bankwidth(map)) {
 		datum = map_word_load(map, buf);
+#ifdef CONFIG_AMAZON
+		map_write(map, datum, (adr + z) ^ 0x2);
+#else
 		map_write(map, datum, adr + z);
+#endif
 
 		z += map_bankwidth(map);
 		buf += map_bankwidth(map);
@@ -1634,6 +1641,9 @@ static int __xipram do_erase_oneblock(st
 	int ret = 0;
 
 	adr += chip->start;
+#ifdef CONFIG_AMAZON
+	adr ^= 2;
+#endif
 
 	spin_lock(chip->mutex);
 	ret = get_chip(map, chip, adr, FL_ERASING);
@@ -1762,6 +1772,10 @@ static int do_atmel_lock(struct map_info
 	struct cfi_private *cfi = map->fldrv_priv;
 	int ret;
 
+#ifdef CONFIG_AMAZON
+	adr ^= 2;
+#endif
+
 	spin_lock(chip->mutex);
 	ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
 	if (ret)
@@ -1798,6 +1812,10 @@ static int do_atmel_unlock(struct map_in
 	struct cfi_private *cfi = map->fldrv_priv;
 	int ret;
 
+#ifdef CONFIG_AMAZON
+	adr ^= 2;
+#endif
+
 	spin_lock(chip->mutex);
 	ret = get_chip(map, chip, adr + chip->start, FL_UNLOCKING);
 	if (ret)