summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRogan Dawes <rogan@dawes.za.net>2011-04-13 23:54:53 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-04-27 19:38:08 +0200
commit286a5b253a5a154d8b0a1403258bc8b99600fc98 (patch)
tree4c85e61828a64a211637942f445e69d8bfe84960
parent81a9ab21ca4f1af85efd37de7baaad131f0e7edc (diff)
downloadu-boot-imx-286a5b253a5a154d8b0a1403258bc8b99600fc98.zip
u-boot-imx-286a5b253a5a154d8b0a1403258bc8b99600fc98.tar.gz
u-boot-imx-286a5b253a5a154d8b0a1403258bc8b99600fc98.tar.bz2
Orion5x: Correct DRAM bank detection
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/dram.c2
-rw-r--r--arch/arm/include/asm/arch-orion5x/orion5x.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c b/arch/arm/cpu/arm926ejs/orion5x/dram.c
index b749282..2ae8f48 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/dram.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/dram.c
@@ -38,7 +38,7 @@ u32 orion5x_sdram_bar(enum memory_bank bank)
{
struct orion5x_ddr_addr_decode_registers *winregs =
(struct orion5x_ddr_addr_decode_registers *)
- ORION5X_CPU_WIN_BASE;
+ ORION5X_DRAM_BASE;
u32 result = 0;
u32 enable = 0x01 & winregs[bank].size;
diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h
index e3d3f76..1dd9f65 100644
--- a/arch/arm/include/asm/arch-orion5x/orion5x.h
+++ b/arch/arm/include/asm/arch-orion5x/orion5x.h
@@ -42,6 +42,7 @@
#define ORION5X_REGISTER(x) (ORION5X_REGS_PHY_BASE + x)
/* Documented registers */
+#define ORION5X_DRAM_BASE (ORION5X_REGISTER(0x01500))
#define ORION5X_TWSI_BASE (ORION5X_REGISTER(0x11000))
#define ORION5X_UART0_BASE (ORION5X_REGISTER(0x12000))
#define ORION5X_UART1_BASE (ORION5X_REGISTER(0x12100))