summaryrefslogtreecommitdiffstats
path: root/board/freescale/p1023rds
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-12-02 08:38:28 -0500
committerTom Rini <trini@ti.com>2013-12-02 08:38:28 -0500
commit77fdd6d1eb69c1194148a9f4b4428d903af3619f (patch)
tree1ab1b0a75a4b77cf5be89e457eea772d2b5e6b30 /board/freescale/p1023rds
parentd19ad726bcd5d9106f7ba9c750462fcc369f1020 (diff)
parentf7f155e1e180e2e7743a036016ed917bba581d98 (diff)
downloadtalos-obmc-uboot-77fdd6d1eb69c1194148a9f4b4428d903af3619f.tar.gz
talos-obmc-uboot-77fdd6d1eb69c1194148a9f4b4428d903af3619f.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/p1023rds')
-rw-r--r--board/freescale/p1023rds/p1023rds.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/freescale/p1023rds/p1023rds.c b/board/freescale/p1023rds/p1023rds.c
index 7c54b65c1d..d8c87458e8 100644
--- a/board/freescale/p1023rds/p1023rds.c
+++ b/board/freescale/p1023rds/p1023rds.c
@@ -16,7 +16,7 @@
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_pci.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/fsl_portals.h>
#include <libfdt.h>
#include <fdt_support.h>
@@ -58,7 +58,8 @@ int checkboard(void)
phys_size_t fixed_sdram(void)
{
#ifndef CONFIG_SYS_RAMBOOT
- ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR;
+ struct ccsr_ddr __iomem *ddr =
+ (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR;
set_next_law(0, LAW_SIZE_2G, LAW_TRGT_IF_DDR_1);
OpenPOWER on IntegriCloud