summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-07-30 14:13:16 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-01 14:58:13 +0200
commit942d3f0174700ec5d823f0f9a415b86d7cde2a9e (patch)
treea5a54fcc984b7b1cce40b170af83b5ced8a3621f
parenta74f0c7cb505d3e2184bfd2ab42c3a6e45a1d54a (diff)
downloadu-boot-imx-942d3f0174700ec5d823f0f9a415b86d7cde2a9e.zip
u-boot-imx-942d3f0174700ec5d823f0f9a415b86d7cde2a9e.tar.gz
u-boot-imx-942d3f0174700ec5d823f0f9a415b86d7cde2a9e.tar.bz2
am33xx: Move some variables in emif4.c, mark them static.
We need vtpreg and ddrctrl but no longer need a second ddrregs. Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--arch/arm/cpu/armv7/am33xx/emif4.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/emif4.c b/arch/arm/cpu/armv7/am33xx/emif4.c
index 3bb91d3..abeebf2 100644
--- a/arch/arm/cpu/armv7/am33xx/emif4.c
+++ b/arch/arm/cpu/armv7/am33xx/emif4.c
@@ -27,10 +27,6 @@
DECLARE_GLOBAL_DATA_PTR;
-struct ddr_regs *ddrregs = (struct ddr_regs *)DDR_PHY_BASE_ADDR;
-struct vtp_reg *vtpreg = (struct vtp_reg *)VTP0_CTRL_ADDR;
-struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
-
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
@@ -48,6 +44,9 @@ void dram_init_banksize(void)
#ifdef CONFIG_SPL_BUILD
+static struct vtp_reg *vtpreg = (struct vtp_reg *)VTP0_CTRL_ADDR;
+static struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
+
static const struct ddr_data ddr2_data = {
.datardsratio0 = ((DDR2_RD_DQS<<30)|(DDR2_RD_DQS<<20)
|(DDR2_RD_DQS<<10)|(DDR2_RD_DQS<<0)),