diff options
author | Tom Rini <trini@ti.com> | 2013-12-02 08:38:28 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-12-02 08:38:28 -0500 |
commit | 77fdd6d1eb69c1194148a9f4b4428d903af3619f (patch) | |
tree | 1ab1b0a75a4b77cf5be89e457eea772d2b5e6b30 /board/freescale/mpc8536ds/mpc8536ds.c | |
parent | d19ad726bcd5d9106f7ba9c750462fcc369f1020 (diff) | |
parent | f7f155e1e180e2e7743a036016ed917bba581d98 (diff) | |
download | u-boot-imx-77fdd6d1eb69c1194148a9f4b4428d903af3619f.zip u-boot-imx-77fdd6d1eb69c1194148a9f4b4428d903af3619f.tar.gz u-boot-imx-77fdd6d1eb69c1194148a9f4b4428d903af3619f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/mpc8536ds/mpc8536ds.c')
-rw-r--r-- | board/freescale/mpc8536ds/mpc8536ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 5daab69..467f4f2 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -12,7 +12,7 @@ #include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_serdes.h> #include <spd.h> @@ -90,7 +90,7 @@ int checkboard (void) phys_size_t fixed_sdram (void) { volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; - volatile ccsr_ddr_t *ddr= &immap->im_ddr; + struct ccsr_ddr __iomem *ddr = &immap->im_ddr; uint d_init; ddr->cs0_bnds = CONFIG_SYS_DDR_CS0_BNDS; |