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

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

@@ -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)