commit c4e455afc4e9e1884d0985888d4a85d36f02f320
author Tom Rini <trini@ti.com> Sat Nov 16 20:23:22 2013 -0500
committer Tom Rini <trini@ti.com> Sun Nov 17 14:11:34 2013 -0500
tree a800c23fbc911a8c6c39566ad943fe147df003fb
parent d008e6c53505b71d2abf204ce114ff737a5d2b41
parent c1df3700716372698d201ac469c98fc33bb8d8ad

Merge branch 'master' of git://git.denx.de/u-boot-mips

arch/mips/include/asm/malta.h

diff --git a/arch/mips/include/asm/malta.h b/arch/mips/include/asm/malta.h
index 9b1100b..bd9043d 100644
--- a/arch/mips/include/asm/malta.h
+++ b/arch/mips/include/asm/malta.h
@@ -44,7 +44,7 @@
 #define MALTA_RESET_BASE		0x1f000500
 #define GORESET				0x42
 
-#define MALTA_FLASH_BASE		0x1fc00000
+#define MALTA_FLASH_BASE		0x1e000000
 
 #define MALTA_REVISION			0x1fc00010
 #define MALTA_REVISION_CORID_SHF	10

include/configs/malta.h

diff --git a/include/configs/malta.h b/include/configs/malta.h
index 4098e72..458c33a 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -40,8 +40,8 @@
 /*
  * Memory map
  */
-#define CONFIG_SYS_TEXT_BASE		0xbfc00000 /* Rom version */
-#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
+#define CONFIG_SYS_TEXT_BASE		0xbe000000 /* Rom version */
+#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000 /* Cached addr */
 #define CONFIG_SYS_MEM_SIZE		(256 * 1024 * 1024)