summaryrefslogtreecommitdiff
path: root/nand_spl/board
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 /nand_spl/board
parentd19ad726bcd5d9106f7ba9c750462fcc369f1020 (diff)
parentf7f155e1e180e2e7743a036016ed917bba581d98 (diff)
downloadu-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 'nand_spl/board')
-rw-r--r--nand_spl/board/freescale/mpc8569mds/nand_boot.c2
-rw-r--r--nand_spl/board/freescale/p1023rds/nand_boot.c5
-rw-r--r--nand_spl/board/freescale/p1_p2_rdb/nand_boot.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/nand_spl/board/freescale/mpc8569mds/nand_boot.c b/nand_spl/board/freescale/mpc8569mds/nand_boot.c
index 716b737..ce7f619 100644
--- a/nand_spl/board/freescale/mpc8569mds/nand_boot.c
+++ b/nand_spl/board/freescale/mpc8569mds/nand_boot.c
@@ -10,7 +10,7 @@
#include <nand.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/fsl_law.h>
#define SYSCLK_66 66666666
diff --git a/nand_spl/board/freescale/p1023rds/nand_boot.c b/nand_spl/board/freescale/p1023rds/nand_boot.c
index 9468000..d9afa6d 100644
--- a/nand_spl/board/freescale/p1023rds/nand_boot.c
+++ b/nand_spl/board/freescale/p1023rds/nand_boot.c
@@ -10,7 +10,7 @@
#include <asm/io.h>
#include <nand.h>
#include <asm/fsl_law.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -18,7 +18,8 @@ DECLARE_GLOBAL_DATA_PTR;
/* Fixed sdram init -- doesn't use serial presence detect. */
void sdram_init(void)
{
- 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);
diff --git a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
index 3244c8f..f7e8438 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
+++ b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
@@ -10,7 +10,7 @@
#include <nand.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
-#include <asm/fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/fsl_law.h>
#define SYSCLK_MASK 0x00200000