diff options
| author | Tom Rini <trini@ti.com> | 2013-11-16 20:23:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-17 14:11:34 -0500 |
| commit | c2e5e802ecb7ab668ce9911b210ed68c804b349f (patch) | |
| tree | a800c23fbc911a8c6c39566ad943fe147df003fb | |
| parent | 4678d742567e282d9e0f786441f59102e8d3553e (diff) | |
| parent | 10473d0490a08cc1bc7748e710dc562a64206c30 (diff) | |
| download | u-boot-imx-c2e5e802ecb7ab668ce9911b210ed68c804b349f.zip u-boot-imx-c2e5e802ecb7ab668ce9911b210ed68c804b349f.tar.gz u-boot-imx-c2e5e802ecb7ab668ce9911b210ed68c804b349f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
| -rw-r--r-- | arch/mips/include/asm/malta.h | 2 | ||||
| -rw-r--r-- | include/configs/malta.h | 4 |
2 files changed, 3 insertions, 3 deletions
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 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) |