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/mpc8540ads | |
parent | d19ad726bcd5d9106f7ba9c750462fcc369f1020 (diff) | |
parent | f7f155e1e180e2e7743a036016ed917bba581d98 (diff) | |
download | talos-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/mpc8540ads')
-rw-r--r-- | board/freescale/mpc8540ads/ddr.c | 4 | ||||
-rw-r--r-- | board/freescale/mpc8540ads/mpc8540ads.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/board/freescale/mpc8540ads/ddr.c b/board/freescale/mpc8540ads/ddr.c index 9e79815278..41d4cfe738 100644 --- a/board/freescale/mpc8540ads/ddr.c +++ b/board/freescale/mpc8540ads/ddr.c @@ -8,8 +8,8 @@ #include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c index 175eefcc6b..93288c7e9c 100644 --- a/board/freescale/mpc8540ads/mpc8540ads.c +++ b/board/freescale/mpc8540ads/mpc8540ads.c @@ -14,7 +14,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <libfdt.h> #include <fdt_support.h> @@ -168,7 +168,8 @@ void lbc_sdram_init(void) phys_size_t fixed_sdram(void) { #ifndef CONFIG_SYS_RAMBOOT - volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); + struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR); ddr->cs0_bnds = CONFIG_SYS_DDR_CS0_BNDS; ddr->cs0_config = CONFIG_SYS_DDR_CS0_CONFIG; |