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

diff --git a/arch/mips/include/asm/malta.h b/arch/mips/include/asm/malta.h
index 9b1100bc4950807065c51c19cecacb47d4e767bf..bd9043d51cdf49b09a99b2d4cf71912933040e82 100644 (file)
--- 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

diff --git a/include/configs/malta.h b/include/configs/malta.h
index 4098e724fef68a7e4cc9865e746a6221a9fcf697..458c33a58611dfb03ab369b95aa20469e01b685b 100644 (file)
--- 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)